[oe-commits] org.oe.dev xserver-kdrive-xomap: merge from poky
koen commit
openembedded-commits at lists.openembedded.org
Fri May 18 13:58:45 UTC 2007
xserver-kdrive-xomap: merge from poky
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 806fd6cb0eaf64ba53d6f1deb9ce6b64d37552f8
ViewMTN: http://monotone.openembedded.org/revision.psp?id=806fd6cb0eaf64ba53d6f1deb9ce6b64d37552f8
Files:
1
packages/xorg-xserver/xserver-kdrive-xomap
packages/xorg-xserver/xserver-kdrive-xomap/button_only.patch
packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch
packages/xorg-xserver/xserver-kdrive-xomap/disable-apm.patch
packages/xorg-xserver/xserver-kdrive-xomap/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-xomap/enable-builtin-fonts.patch
packages/xorg-xserver/xserver-kdrive-xomap/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-xomap/fbdev-not-fix.patch
packages/xorg-xserver/xserver-kdrive-xomap/fixups.patch
packages/xorg-xserver/xserver-kdrive-xomap/kdrive-evdev.patch
packages/xorg-xserver/xserver-kdrive-xomap/kdrive-use-evdev.patch
packages/xorg-xserver/xserver-kdrive-xomap/kmode.patch
packages/xorg-xserver/xserver-kdrive-xomap/no-serial-probing.patch
packages/xorg-xserver/xserver-kdrive-xomap/optional-xkb.patch
packages/xorg-xserver/xserver-kdrive-xomap/xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-xomap/xfbdev-fb-opt.patch
packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
Diffs:
#
# mt diff -rb5c064a14500252311464cd7307f86f0d07938fd -r806fd6cb0eaf64ba53d6f1deb9ce6b64d37552f8
#
#
#
# add_dir "packages/xorg-xserver/xserver-kdrive-xomap"
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/button_only.patch"
# content [fb339ad3d3f48f1cb0d0e8d6e5c51d4487b6fb77]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch"
# content [142ac33cb93044f2df7290867e0e876e54d12296]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/disable-apm.patch"
# content [525686ab632e96cfb52f3ab7f16d52dd7b4934ec]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/disable-xf86-dga-xorgcfg.patch"
# content [de92f28a1a699264ba9ffcda3e9a8a7128e8e8e7]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/enable-builtin-fonts.patch"
# content [1b387b21795b0cd54e91a05469fe95a2afb93465]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/enable-tslib.patch"
# content [9592235d0e51c12ff8ffe562c080515e39508b46]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/fbdev-not-fix.patch"
# content [8e4251348b00c309103155535ca4405659ce426f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/fixups.patch"
# content [d3af199aa79aba247fd8f8aee092bd21f33c5fa6]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/kdrive-evdev.patch"
# content [5a973c415d2487bcead4df7e9766e0efc1022dea]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/kdrive-use-evdev.patch"
# content [3f6ee860cd1b75ef883f99b0531f96d609275974]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/kmode.patch"
# content [a323594842f8a7c6fe8e6f8197eeb86c51502dd5]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/no-serial-probing.patch"
# content [13f99489b0ad9d42e6bfab1475407097592bc47c]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/optional-xkb.patch"
# content [8c3b985db399bd197241e7c4d2e9db6059f962d6]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/xcalibrate.patch"
# content [c40d4081ebeef8c1fbccbfaf41a7967d1eafef0f]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap/xfbdev-fb-opt.patch"
# content [df685f67a2da537a522b5409cab67f6d1e5445f5]
#
# add_file "packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb"
# content [8675332ab6c4ae86a31e42b1aea3c357581107a6]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/button_only.patch fb339ad3d3f48f1cb0d0e8d6e5c51d4487b6fb77
+++ packages/xorg-xserver/xserver-kdrive-xomap/button_only.patch fb339ad3d3f48f1cb0d0e8d6e5c51d4487b6fb77
@@ -0,0 +1,20 @@
+---
+ hw/kdrive/linux/tslib.c | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+Index: xorg-server-1.1.99.3/hw/kdrive/linux/tslib.c
+===================================================================
+--- xorg-server-1.1.99.3.orig/hw/kdrive/linux/tslib.c 2007-05-17 10:28:12.000000000 +0100
++++ xorg-server-1.1.99.3/hw/kdrive/linux/tslib.c 2007-05-17 10:28:42.000000000 +0100
+@@ -111,10 +111,7 @@ TsRead (int fd, void *closure)
+ event.pressure);
+ discard = 0;
+ if (event.pressure) {
+- if (event.pressure > pi->dixdev->absolute->button_threshold)
+- flags = KD_BUTTON_8;
+- else
+- flags = KD_BUTTON_1;
++ flags = KD_BUTTON_1;
+
+ /*
+ * Here we test for the touch screen driver actually being on the
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch 142ac33cb93044f2df7290867e0e876e54d12296
+++ packages/xorg-xserver/xserver-kdrive-xomap/calibrateext.patch 142ac33cb93044f2df7290867e0e876e54d12296
@@ -0,0 +1,137 @@
+---
+ configure |38107 -----------------------------------------------------------
+ configure.ac | 2 -
+ hw/kdrive/linux/tslib.c | 68 ++++++++++++++++++++++++++----------------------
+ 2 files changed, 39 insertions(+), 31 deletions(-)
+
+
+Index: xorg-server-1.1.99.3/configure.ac
+===================================================================
+--- xorg-server-1.1.99.3.orig/configure.ac 2007-01-30 00:22:41.000000000 +0000
++++ xorg-server-1.1.99.3/configure.ac 2007-01-30 00:22:41.000000000 +0000
+@@ -717,7 +717,7 @@ fi
+
+ if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then
+ AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension])
+- REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto"
++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext"
+ else
+ XCALIBRATE=no
+ fi
+Index: xorg-server-1.1.99.3/hw/kdrive/linux/tslib.c
+===================================================================
+--- xorg-server-1.1.99.3.orig/hw/kdrive/linux/tslib.c 2007-01-30 00:44:13.000000000 +0000
++++ xorg-server-1.1.99.3/hw/kdrive/linux/tslib.c 2007-01-30 21:55:52.000000000 +0000
+@@ -47,6 +47,10 @@
+
+ #define TSLIB_QUEUE_SIZE 3
+
++/* For XCalibrate extension */
++void (*tslib_raw_event_hook)(int x, int y, int pressure, void *closure);
++void *tslib_raw_event_closure;
++
+ struct TslibPrivate {
+ int fd;
+ int lastx, lasty;
+@@ -76,6 +80,19 @@ TsRead (int fd, void *closure)
+ unsigned long flags = 0;
+ int discard = 0;
+
++ if (tslib_raw_event_hook)
++ {
++ /* XCalibrate Ext */
++ if (ts_read_raw(private->tsDev, &event, 1) == 1)
++ {
++ tslib_raw_event_hook (event.x,
++ event.y,
++ event.pressure,
++ tslib_raw_event_closure);
++ }
++ return;
++ }
++
+ if (!private->tsDev) {
+ DebugF("[tslib] EXTREME BADNESS: TsRead called while tsDev is null!\n");
+ return;
+@@ -322,14 +339,14 @@ TsRead (int fd, void *closure)
+ }
+ }
+
+-/* must always be NULL-terminated. */
+-char *valid_ts_names[] = {
+- "ADS784x Touchscreen",
+- "omap-ts",
+- "TSC2301 touchscreen",
+- NULL
++static char *TsNames[] = {
++ NULL, /* set via TSLIB_TSDEVICE */
++ "/dev/ts",
++ "/dev/touchscreen/0",
+ };
+
++#define NUM_TS_NAMES (sizeof (TsNames) / sizeof (TsNames[0]))
++
+ #define TS_NAME_SIZE 32
+
+ static Status
+@@ -383,11 +400,10 @@ TslibDisable (KdPointerInfo *pi)
+ private->tsDev = NULL;
+ }
+
+-
+ static Status
+ TslibInit (KdPointerInfo *pi)
+ {
+- int fd = 0, i = 0;
++ int fd = 0, i = 0, j = 0;
+ char devpath[PATH_MAX], devname[TS_NAME_SIZE];
+ DIR *inputdir = NULL;
+ struct dirent *inputent = NULL;
+@@ -397,33 +413,25 @@ TslibInit (KdPointerInfo *pi)
+ return !Success;
+
+ if (!pi->path || strcmp(pi->path, "auto") == 0) {
+- if (!(inputdir = opendir("/dev/input"))) {
+- ErrorF("[tslib/TslibInit]: couldn't open /dev/input!\n");
+- return BadMatch;
+- }
+
+- while ((inputent = readdir(inputdir))) {
+- if (strncmp(inputent->d_name, "event", 5) != 0)
+- continue;
++ if ((TsNames[0] = getenv("TSLIB_TSDEVICE")) == NULL)
++ j++;
++
++ for (i = j; i < NUM_TS_NAMES; i++)
++ {
++ struct tsdev *tsDev;
+
+- snprintf(devpath, PATH_MAX, "/dev/input/%s", inputent->d_name);
+- fd = open(devpath, O_RDWR);
++ if(!(tsDev = ts_open(TsNames[i], 0)))
++ continue;
+
+- if (!ioctl(fd, EVIOCGNAME(sizeof(devname)), devname)) {
+- close(fd);
++ if (ts_config(tsDev))
+ continue;
+- }
+- close(fd);
+
+- for (i = 0; valid_ts_names[i]; i++) {
+- if (strcmp(devname, valid_ts_names[i]) == 0) {
+- pi->path = KdSaveString(devpath);
+- break;
+- }
+- }
+- }
+-
+- closedir(inputdir);
++ ts_close(tsDev);
++
++ pi->path = KdSaveString(TsNames[i]);
++ break;
++ }
+ }
+
+ if (!pi->path || strcmp(pi->path, "auto") == 0) {
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/disable-apm.patch 525686ab632e96cfb52f3ab7f16d52dd7b4934ec
+++ packages/xorg-xserver/xserver-kdrive-xomap/disable-apm.patch 525686ab632e96cfb52f3ab7f16d52dd7b4934ec
@@ -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
+ */
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/disable-xf86-dga-xorgcfg.patch de92f28a1a699264ba9ffcda3e9a8a7128e8e8e7
+++ packages/xorg-xserver/xserver-kdrive-xomap/disable-xf86-dga-xorgcfg.patch de92f28a1a699264ba9ffcda3e9a8a7128e8e8e7
@@ -0,0 +1,37 @@
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -505,7 +505,11 @@
+ XEXTXORG_LIB='$(top_builddir)/Xext/libXextbuiltin.la'
+
+ dnl Core modules for most extensions, et al.
++if test "$KDRIVE" = yes; then
++REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto"
++else
+ REQUIRED_MODULES="randrproto renderproto [fixesproto >= 4.0] damageproto xcmiscproto xextproto xproto xtrans xf86miscproto xf86vidmodeproto xf86bigfontproto [scrnsaverproto >= 1.1] bigreqsproto resourceproto fontsproto inputproto xf86dgaproto"
++fi
+ REQUIRED_LIBS="xfont xau fontenc"
+
+ AM_CONDITIONAL(XV, [test "x$XV" = xyes])
+@@ -1514,7 +1526,9 @@
+ AC_SUBST(XKB_COMPILED_DIR)
+
+ dnl and the rest of these are generic, so they're in config.h
++if test ! x"$KDRIVE" = xyes; then
+ AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
++fi
+ AC_DEFINE(XResExtension, 1, [Build XRes extension])
+
+ dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
+@@ -1534,10 +1548,12 @@
+
+ AC_DEFINE_DIR(PROJECTROOT, prefix, [Overall prefix])
+
++if test ! "x$KDRIVE" = xyes ; then
+ dnl xorgconfig CLI configuration utility
+ PKG_CHECK_MODULES([XORGCONFIG_DEP], [xkbfile x11])
+ AC_SUBST(XORGCONFIG_DEP_CFLAGS)
+ AC_SUBST(XORGCONFIG_DEP_LIBS)
++fi
+
+ dnl xorgcfg GUI configuration utility
+ AC_ARG_ENABLE(xorgcfg, AS_HELP_STRING([--enable-xorgcfg],
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/enable-builtin-fonts.patch 1b387b21795b0cd54e91a05469fe95a2afb93465
+++ packages/xorg-xserver/xserver-kdrive-xomap/enable-builtin-fonts.patch 1b387b21795b0cd54e91a05469fe95a2afb93465
@@ -0,0 +1,12 @@
+--- xorg-server-X11R7.1-1.1.0/dix/dixfonts.c.orig 2006-06-08 14:49:12.158684250 +0200
++++ xorg-server-X11R7.1-1.1.0/dix/dixfonts.c 2006-06-08 14:49:52.493205000 +0200
+@@ -52,8 +52,8 @@
+ /* $Xorg: dixfonts.c,v 1.4 2000/08/17 19:48:18 cpqbld Exp $ */
+
+ #define NEED_REPLIES
+ #ifdef HAVE_DIX_CONFIG_H
+-#include <dix-config.h>
++#include <kdrive-config.h>
+ #endif
+
+ #include <X11/X.h>
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/enable-tslib.patch 9592235d0e51c12ff8ffe562c080515e39508b46
+++ packages/xorg-xserver/xserver-kdrive-xomap/enable-tslib.patch 9592235d0e51c12ff8ffe562c080515e39508b46
@@ -0,0 +1,23 @@
+--- git/configure.ac.orig 2006-05-22 22:40:00.000000000 +0200
++++ git/configure.ac 2006-06-10 15:10:14.000000000 +0200
+@@ -1438,6 +1446,10 @@
+ fi
+
+- # tslib...
++ AC_CHECK_HEADERS([tslib.h])
++ if test "$ac_cv_header_tslib_h" = yes; then
++ AC_DEFINE(TSLIB, 1, [Build kdrive with tslib support])
++ AC_DEFINE(TOUCHSCREEN, 1, [Build kdrive with touchscreen support])
++ fi
+
+ # damage shadow extension glx (NOTYET) fb mi
+ KDRIVE_INC='-I$(top_srcdir)/hw/kdrive/src'
+@@ -1467,7 +1479,7 @@
+ AC_SUBST(KDRIVE_CFLAGS)
+ AC_SUBST(KDRIVE_PURE_LIBS)
+ AC_SUBST(KDRIVE_LIBS)
+-AM_CONDITIONAL(TSLIB, false)
++AM_CONDITIONAL(TSLIB, [test x"$ac_cv_header_tslib_h" = xyes])
+ AM_CONDITIONAL(H3600_TS, false)
+ AM_CONDITIONAL(KDRIVEVESA, [test x"$ac_cv_header_sys_vm86_h" = xyes])
+ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/fbdev-not-fix.patch 8e4251348b00c309103155535ca4405659ce426f
+++ packages/xorg-xserver/xserver-kdrive-xomap/fbdev-not-fix.patch 8e4251348b00c309103155535ca4405659ce426f
@@ -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;
============================================================
--- packages/xorg-xserver/xserver-kdrive-xomap/fixups.patch d3af199aa79aba247fd8f8aee092bd21f33c5fa6
+++ packages/xorg-xserver/xserver-kdrive-xomap/fixups.patch d3af199aa79aba247fd8f8aee092bd21f33c5fa6
@@ -0,0 +1,446 @@
+---
+ Xi/chgdctl.c | 55 +++++++++++++++++++------
+ Xi/getdctl.c | 87 +++++++++++++++++++++++++++++++----------
+ Xi/getdctl.h | 11 +++--
+ Xi/stubs.c | 2
+ configure.ac | 2
+ dix/devices.c | 31 +++++++++-----
+ hw/kdrive/linux/tslib.c | 8 +--
+ hw/kdrive/src/kinput.c | 6 +-
+ hw/xfree86/common/xf86Xinput.c | 3 -
+ include/input.h | 2
+ include/inputstr.h | 18 +++++++-
+ 11 files changed, 162 insertions(+), 63 deletions(-)
+
+Index: xorg-server-1.1.99.3/Xi/chgdctl.c
+===================================================================
+--- xorg-server-1.1.99.3.orig/Xi/chgdctl.c 2007-01-29 22:58:18.000000000 +0000
++++ xorg-server-1.1.99.3/Xi/chgdctl.c 2007-01-29 22:59:27.000000000 +0000
+@@ -104,8 +104,10 @@ ProcXChangeDeviceControl(ClientPtr clien
+ xChangeDeviceControlReply rep;
+ AxisInfoPtr a;
+ CARD32 *resolution;
+- xDeviceTSCtl *ts;
++ xDeviceAbsCalibCtl *calib;
++ xDeviceAbsAreaCtl *area;
+ xDeviceCoreCtl *c;
++ xDeviceEnableCtl *e;
+
+ REQUEST(xChangeDeviceControlReq);
+ REQUEST_AT_LEAST_SIZE(xChangeDeviceControlReq);
+@@ -170,25 +172,28 @@ ProcXChangeDeviceControl(ClientPtr clien
+ return Success;
+ }
+ break;
+- case DEVICE_TOUCHSCREEN:
+- ts = (xDeviceTSCtl *)&stuff[1];
+-
+- if (ts->button_threshold < 0 || ts->button_threshold > 255) {
++ case DEVICE_ABS_CALIB:
++ calib = (xDeviceAbsCalibCtl *)&stuff[1];
++
++ if (calib->button_threshold < 0 || calib->button_threshold > 255) {
+ SendErrorToClient(client, IReqCode, X_ChangeDeviceControl, 0,
+ BadValue);
+ return Success;
+ }
+
+- status = ChangeDeviceControl(client, dev, (xDeviceCtl *) ts);
++ status = ChangeDeviceControl(client, dev, (xDeviceCtl *) calib);
+
+ if (status == Success) {
+- dev->touchscreen->min_x = ts->min_x;
+- dev->touchscreen->max_x = ts->max_x;
+- dev->touchscreen->min_y = ts->min_y;
+- dev->touchscreen->max_y = ts->max_y;
+- dev->touchscreen->button_threshold = ts->button_threshold;
+- } else if (status == DeviceBusy) {
+- rep.status = DeviceBusy;
++ dev->absolute->min_x = calib->min_x;
++ dev->absolute->max_x = calib->max_x;
++ dev->absolute->min_y = calib->min_y;
++ dev->absolute->max_y = calib->max_y;
++ dev->absolute->flip_x = calib->flip_x;
++ dev->absolute->flip_y = calib->flip_y;
++ dev->absolute->rota%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list