[oe-commits] org.oe.dev kdrive (imageon) 1.2.0: apply xcalibrate patch needed for recent changes
koen commit
openembedded-commits at lists.openembedded.org
Thu Aug 2 14:40:40 UTC 2007
kdrive (imageon) 1.2.0: apply xcalibrate patch needed for recent changes
Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b746e26ec16b8248e1186faf588d78c3d2f08dd6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b746e26ec16b8248e1186faf588d78c3d2f08dd6
Files:
1
packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch
packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb
packages/xorg-xserver/xserver-kdrive_1.2.0.bb
Diffs:
#
# mt diff -re522f57129d85a81fc9c728d6013973caeeffefc -rb746e26ec16b8248e1186faf588d78c3d2f08dd6
#
#
#
# add_file "packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch"
# content [5609d186544899c77e1719cc694048d4a359ec4f]
#
# patch "packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb"
# from [6f46a29c5e12dd307e0dc9163fbbab191f87c59f]
# to [a9dc5d8c7c56a2a619f762319824ee45278641fe]
#
# patch "packages/xorg-xserver/xserver-kdrive_1.2.0.bb"
# from [25f60a16c5e4f8c1191858a7e16e298ec11b693d]
# to [6006f4a33e9017387993d00c8f97b256f0f29b1f]
#
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch 5609d186544899c77e1719cc694048d4a359ec4f
+++ packages/xorg-xserver/xserver-kdrive-1.2.0/xcalibrate_coords.patch 5609d186544899c77e1719cc694048d4a359ec4f
@@ -0,0 +1,122 @@
+---
+ Xext/xcalibrate.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
+ hw/kdrive/src/kdrive.h | 3 +++
+ hw/kdrive/src/kinput.c | 12 ++++++++++++
+ 3 files changed, 61 insertions(+), 1 deletion(-)
+
+Index: xorg-server-1.3.0.0/Xext/xcalibrate.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/Xext/xcalibrate.c 2007-06-29 17:30:03.000000000 +0100
++++ xorg-server-1.3.0.0/Xext/xcalibrate.c 2007-06-30 14:04:40.000000000 +0100
+@@ -166,7 +166,6 @@ ProcXCalibrateSetRawMode (ClientPtr clie
+ return (client->noClientException);
+ }
+
+-
+ static int
+ SProcXCalibrateSetRawMode (ClientPtr client)
+ {
+@@ -180,6 +179,47 @@ SProcXCalibrateSetRawMode (ClientPtr cli
+ return ProcXCalibrateSetRawMode(client);
+ }
+
++static int
++ProcXCalibrateScreenToCoord (ClientPtr client)
++{
++ REQUEST(xXCalibrateScreenToCoordReq);
++ xXCalibrateScreenToCoordReply rep;
++
++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
++
++ memset (&rep, 0, sizeof (rep));
++ rep.type = X_Reply;
++ rep.sequenceNumber = client->sequence;
++ rep.x = stuff->x;
++ rep.y = stuff->y;
++
++ KdScreenToMouseCoords(&rep.x, &rep.y);
++
++ if (client->swapped)
++ {
++ int n;
++
++ swaps (&rep.x, n);
++ swaps (&rep.y, n);
++ }
++ WriteToClient(client, sizeof (rep), (char *) &rep);
++ return (client->noClientException);
++}
++
++static int
++SProcXCalibrateScreenToCoord (ClientPtr client)
++{
++ REQUEST(xXCalibrateScreenToCoordReq);
++ int n;
++
++ REQUEST_SIZE_MATCH (xXCalibrateScreenToCoordReq);
++
++ swaps(&stuff->x, n);
++ swaps(&stuff->y, n);
++
++ return ProcXCalibrateScreenToCoord(client);
++}
++
+ static void
+ XCalibrateResetProc (ExtensionEntry *extEntry)
+ {
+@@ -194,6 +234,9 @@ ProcXCalibrateDispatch (ClientPtr client
+ return ProcXCalibrateQueryVersion(client);
+ case X_XCalibrateRawMode:
+ return ProcXCalibrateSetRawMode(client);
++ case X_XCalibrateScreenToCoord:
++ return ProcXCalibrateScreenToCoord(client);
++
+ default: break;
+ }
+
+@@ -213,6 +256,8 @@ SProcXCalibrateDispatch (ClientPtr clien
+ return SProcXCalibrateQueryVersion(client);
+ case X_XCalibrateRawMode:
+ return SProcXCalibrateSetRawMode(client);
++ case X_XCalibrateScreenToCoord:
++ return SProcXCalibrateScreenToCoord(client);
+
+ default: break;
+ }
+Index: xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kdrive.h 2007-06-30 13:43:45.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/src/kdrive.h 2007-06-30 13:45:03.000000000 +0100
+@@ -746,6 +746,9 @@ void
+ KdSetMouseMatrix (KdMouseMatrix *matrix);
+
+ void
++KdScreenToMouseCoords (int *x, int *y);
++
++void
+ KdComputeMouseMatrix (KdMouseMatrix *matrix, Rotation randr, int width, int height);
+
+ void
+Index: xorg-server-1.3.0.0/hw/kdrive/src/kinput.c
+===================================================================
+--- xorg-server-1.3.0.0.orig/hw/kdrive/src/kinput.c 2007-06-29 17:30:16.000000000 +0100
++++ xorg-server-1.3.0.0/hw/kdrive/src/kinput.c 2007-06-30 15:52:16.000000000 +0100
+@@ -381,6 +381,18 @@ KdSetMouseMatrix (KdMouseMatrix *matrix)
+ }
+
+ void
++KdScreenToMouseCoords (int *x, int *y)
++{
++ int (*m)[3] = kdMouseMatrix.matrix;
++ int div = m[0][1] * m[1][0] - m[1][1] * m[0][0];
++ int sx = *x;
++ int sy = *y;
++
++ *x = (m[0][1] * sy - m[0][1] * m[1][2] + m[1][1] * m[0][2] - m[1][1] * sx) / div;
++ *y = (m[1][0] * sx + m[0][0] * m[1][2] - m[1][0] * m[0][2] - m[0][0] * sy) / div;
++}
++
++void
+ KdComputeMouseMatrix (KdMouseMatrix *m, Rotation randr, int width, int height)
+ {
+ int x_dir = 1, y_dir = 1;
============================================================
--- packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb 6f46a29c5e12dd307e0dc9163fbbab191f87c59f
+++ packages/xorg-xserver/xserver-kdrive-imageon_1.2.0.bb a9dc5d8c7c56a2a619f762319824ee45278641fe
@@ -1,13 +1,13 @@ DESCRIPTION = "X server for ATI Imageon
require xserver-kdrive-common.inc
DESCRIPTION = "X server for ATI Imageon 100 Cards from freedesktop.org"
-COMPATIBLE_MACHINE = "c7x0"
+#COMPATIBLE_MACHINE = "c7x0"
DEPENDS += "libxkbfile libxcalibrate"
PROVIDES = "virtual/xserver"
PE = "1"
-PR = "r0"
+PR = "r1"
FILESPATH = "${FILE_DIRNAME}/xserver-kdrive-1.2.0:${FILE_DIRNAME}/xserver-kdrive"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
@@ -16,6 +16,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
file://fbcompositesrc8888revnpx0565.patch;patch=1 \
file://kdrive-vidmemarea.patch;patch=1 \
file://kdrive-imageon.patch;patch=1 \
+ file://xcalibrate_coords.patch;patch=1 \
"
S = "${WORKDIR}/xorg-server-${PV}"
============================================================
--- packages/xorg-xserver/xserver-kdrive_1.2.0.bb 25f60a16c5e4f8c1191858a7e16e298ec11b693d
+++ packages/xorg-xserver/xserver-kdrive_1.2.0.bb 6006f4a33e9017387993d00c8f97b256f0f29b1f
@@ -1,9 +1,9 @@ PE = "1"
require xserver-kdrive-common.inc
DEPENDS += "libxkbfile libxcalibrate"
PE = "1"
-PR = "r8"
+PR = "r9"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -11,7 +11,8 @@ SRC_URI = "${XORG_MIRROR}/individual/xse
file://w100.patch;patch=1 \
file://w100-fix-offscreen-bmp.patch;patch=1 \
file://fbcompositesrc8888revnpx0565.patch;patch=1 \
- "
+ file://xcalibrate_coords.patch;patch=1 \
+ "
S = "${WORKDIR}/xorg-server-${PV}"
More information about the Openembedded-commits
mailing list