mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-31 01:10:08 +00:00
Code Issues Projects Releases Wiki Activity

xserver-xorg: upgrade to 1.10.1.901 and return randr-support patch

Browse Source 
* Thanks to Benjamin Deering for updating patch

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2011-05-19 11:26:24 +02:00
parent 90215e2729
commit 5e3dc95107
5 changed files with 135 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/hack-assume-pixman-supports-overlapped-blt.patch → meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/hack-assume-pixman-supports-overlapped-blt.patch
View File
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/hack-fbdev-ignore-return-mode.patch → meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/hack-fbdev-ignore-return-mode.patch
View File
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/randr-support.patch
+131
View File
@@ -0,0 +1,131 @@
diff -ur xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c
--- xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-04-28 09:25:00.000000000 +0200
+++ git/xorg-server-1.10.1.901//hw/xfree86/common/xf86Xinput.c 2011-05-19 00:31:01.178439874 +0200
@@ -99,6 +99,8 @@
return; \
}
+#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
+
EventListPtr xf86Events = NULL;
static int
@@ -1408,4 +1410,73 @@
EnableDevice(dev, TRUE);
}
+/* Taken from evdev-properties.h. */
+#define EVDEV_PROP_SWAP_AXES "Evdev Axes Swap"
+#define EVDEV_PROP_INVERT_AXES "Evdev Axis Inversion"
+
+/* This is a hack until we get device -> CRTC association. */
+void
+xf86InputRotationNotify(Rotation rotation)
+{
+ DeviceIntPtr dev;
+ //LocalDevicePtr local;
+ int ret;
+ int swap_axes = 0;
+ CARD8 invert[2] = { 0, 0 };
+ static Atom prop_swap = 0, prop_invert = 0;
+ static int atom_generation = -1;
+
+ if (atom_generation != serverGeneration) {
+ prop_swap = 0;
+ prop_invert = 0;
+ }
+
+ switch (rotation & RR_Rotate_All) {
+ case RR_Rotate_0:
+ swap_axes = 1;
+ invert[0] = 0;
+ invert[1] = 0;
+ break;
+ case RR_Rotate_90:
+ swap_axes = 0;
+ invert[0] = 0;
+ invert[1] = 1;
+ break;
+ case RR_Rotate_180:
+ swap_axes = 1;
+ invert[0] = 0;
+ invert[1] = 0;
+ break;
+ case RR_Rotate_270:
+ swap_axes = 0;
+ invert[0] = 0;
+ invert[1] = 1;
+ break;
+ }
+
+ if (!prop_swap)
+ prop_swap = MakeAtom(EVDEV_PROP_SWAP_AXES,
+ strlen(EVDEV_PROP_SWAP_AXES), TRUE);
+ if (!prop_invert)
+ prop_invert = MakeAtom(EVDEV_PROP_INVERT_AXES,
+ strlen(EVDEV_PROP_INVERT_AXES), TRUE);
+
+ for (dev = inputInfo.devices; dev; dev = dev->next) {
+ //local = dev->public.devicePrivate;
+ ret = XIChangeDeviceProperty(dev, prop_swap, XA_INTEGER, 8,
+ PropModeReplace, 1, &swap_axes, FALSE);
+ if (ret != Success) {
+ xf86Msg(X_ERROR, "Changing swap_xy property failed!\n");
+ continue;
+ }
+ ret = XIChangeDeviceProperty(dev, prop_invert, XA_INTEGER, 8,
+ PropModeReplace, 2, invert, FALSE);
+ if (ret != Success) {
+ xf86Msg(X_ERROR, "Changing invert property failed!\n");
+ continue;
+ }
+ }
+}
+
+
/* end of xf86Xinput.c */
diff -ur xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c
--- xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-04-28 09:25:00.000000000 +0200
+++ git/xorg-server-1.10.1.901//hw/xfree86/modes/xf86Crtc.c 2011-05-19 00:23:16.244383998 +0200
@@ -389,6 +389,12 @@
if (didLock)
crtc->funcs->unlock (crtc);
+ /*
+ * Rotate Touchscreen
+ */
+ xf86InputRotationNotify(crtc->rotation);
+
+
return ret;
}
diff -ur xorg-server-1.10.1.901//randr/rrscreen.c git/xorg-server-1.10.1.901//randr/rrscreen.c
--- xorg-server-1.10.1.901//randr/rrscreen.c 2011-02-25 04:27:32.000000000 +0100
+++ git/xorg-server-1.10.1.901//randr/rrscreen.c 2011-05-18 23:19:39.007760004 +0200
@@ -910,11 +910,6 @@
*/
width = mode->mode.width;
height = mode->mode.height;
- if (rotation & (RR_Rotate_90|RR_Rotate_270))
- {
- width = mode->mode.height;
- height = mode->mode.width;
- }
if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) {
client->errorValue = width;
@@ -926,7 +921,12 @@
free(pData);
return BadValue;
}
-
+ if (rotation & (RR_Rotate_90|RR_Rotate_270))
+ {
+ width = mode->mode.height;
+ height = mode->mode.width;
+ }
+
if (width != pScreen->width || height != pScreen->height)
{
int c;
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1/replace-pkgconfig-sdkdir-poking.patch → meta-oe/recipes-graphics/xorg-xserver/xserver-xorg-1.10.1.901/replace-pkgconfig-sdkdir-poking.patch
View File
meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.bb → meta-oe/recipes-graphics/xorg-xserver/xserver-xorg_1.10.1.901.bb
+4 -3
View File
@@ -7,15 +7,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"
DESCRIPTION = "the X.Org X server" DESCRIPTION = "the X.Org X server"
DEPENDS += "mesa-dri pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native" DEPENDS += "mesa-dri pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
PE = "2" PE = "2"
PR = "${INC_PR}.1" PR = "${INC_PR}.2"
SRC_URI += " \ SRC_URI += " \
file://randr-support.patch \
file://hack-fbdev-ignore-return-mode.patch \ file://hack-fbdev-ignore-return-mode.patch \
file://hack-assume-pixman-supports-overlapped-blt.patch \ file://hack-assume-pixman-supports-overlapped-blt.patch \
file://replace-pkgconfig-sdkdir-poking.patch \ file://replace-pkgconfig-sdkdir-poking.patch \
" "
SRC_URI[md5sum] = "75f117c74f2ecaf9dd167f6a66ac98de" SRC_URI[md5sum] = "64585a28abb18726d950cf1005bbcce4"
SRC_URI[sha256sum] = "143c7c3d7d4428352e1153dffa34fd64af391f72d30b2a03e911e54e36f00b5d" SRC_URI[sha256sum] = "b7d775891e7e7fc3001763cf5727995b81bf07b72e12d9d41db282fe625298e6"
do_install_prepend() { do_install_prepend() {
mkdir -p ${D}/${libdir}/X11/fonts mkdir -p ${D}/${libdir}/X11/fonts