[oe-commits] Thomas Zimmermann : shr/merge: fix some xorg stuff
git version control
git at git.openembedded.org
Tue Oct 13 19:26:48 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: 1b46c5e05387f1adde984c7edd5fec611d08baa2
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1b46c5e05387f1adde984c7edd5fec611d08baa2
Author: Thomas Zimmermann <zimmermann at vdm-design.de>
Date: Tue Oct 13 17:45:36 2009 +0000
shr/merge: fix some xorg stuff
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>
---
conf/distro/include/preferred-shr-versions.inc | 4 +-
conf/distro/include/shr-autorev-unstable.inc | 2 +-
.../xserver-xorg-1.7.0.901/dolt-fix.patch | 21 +++++
.../randr-support-1.7.0.patch | 96 ++++++++++++++++++++
4 files changed, 120 insertions(+), 3 deletions(-)
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 27afa71..1df8df2 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -846,7 +846,7 @@ PREFERRED_VERSION_libdigest-sha1-perl-native ?= "2.11"
PREFERRED_VERSION_libdisplaymigration ?= "0.99"
PREFERRED_VERSION_libdmx ?= "1.0.2"
PREFERRED_VERSION_libdotdesktop ?= "0.11"
-PREFERRED_VERSION_libdrm ?= "2.3.1"
+PREFERRED_VERSION_libdrm ?= "2.4.11"
PREFERRED_VERSION_libdvb ?= "0.5.5.1"
PREFERRED_VERSION_libdvdnav ?= "0.1.10"
PREFERRED_VERSION_libdvdread ?= "0.9.6"
@@ -1207,7 +1207,7 @@ PREFERRED_VERSION_mdev ?= "1.2.1"
PREFERRED_VERSION_mdk2 ?= "v33"
PREFERRED_VERSION_memedit ?= "0.7"
PREFERRED_VERSION_memtester ?= "4.0.6"
-PREFERRED_VERSION_mesa ?= "7.5.1"
+PREFERRED_VERSION_mesa ?= "7.4"
PREFERRED_VERSION_mesa-dri ?= "7.5.1"
PREFERRED_VERSION_meta-e-x11 ?= "1.0"
PREFERRED_VERSION_meta-e-x11-core ?= "1.0"
diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
index dba26bc..d8cf745 100644
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -85,7 +85,7 @@ SRCREV_pn-shr-splash-theme-dontpanic = "${AUTOREV}"
SRCREV_pn-shr-splash-theme-handy = "${AUTOREV}"
SRCREV_pn-shr-splash-theme-niebiee = "${AUTOREV}"
SRCREV_pn-shr-installer = "${AUTOREV}"
-SRCREV_pn-shr-config = "${AUTOREV}"
+SRCREV_pn-shr-config = "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
SRCREV_pn-libphone-utils = "${AUTOREV}"
SRCREV_pn-python-phoneutils = "${AUTOREV}"
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.0.901/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.0.901/dolt-fix.patch
new file mode 100644
index 0000000..414d72d
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.0.901/dolt-fix.patch
@@ -0,0 +1,21 @@
+Index: xorg-server/m4/dolt.m4
+===================================================================
+--- xorg-server/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400
++++ xorg-server-2/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400
+@@ -147,7 +147,7 @@
+ cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
+ #!$DOLT_BASH
+ __DOLTLIBTOOL__EOF__
+- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
+ top_builddir_slash="${0%%doltlibtool}"
+ : ${top_builddir_slash:=./}
+ args=()
+@@ -163,7 +163,7 @@
+ if $modeok && $tagok ; then
+ . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
+ else
+- exec ${top_builddir_slash}libtool "$[]@"
++ exec ${top_builddir_slash}@host_alias at -libtool "$[]@"
+ fi
+ __DOLTLIBTOOL__EOF__
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.0.901/randr-support-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg-1.7.0.901/randr-support-1.7.0.patch
new file mode 100644
index 0000000..fb8d381
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.7.0.901/randr-support-1.7.0.patch
@@ -0,0 +1,96 @@
+diff -Nur xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c
+--- xorg-server-1.7.0.orig/hw/xfree86/common/xf86Xinput.c 2009-09-24 07:12:00.000000000 +0200
++++ xorg-server-1.7.0/hw/xfree86/common/xf86Xinput.c 2009-10-08 11:45:50.000000000 +0200
+@@ -95,6 +95,8 @@
+
+ #include "os.h"
+
++#define RR_Rotate_All (RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
++
+ EventListPtr xf86Events = NULL;
+
+ /**
+@@ -1086,4 +1088,67 @@
+ 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:
++ break;
++ case RR_Rotate_90:
++ swap_axes = 1;
++ invert[0] = 1;
++ break;
++ case RR_Rotate_180:
++ invert[0] = 1;
++ invert[1] = 1;
++ break;
++ case RR_Rotate_270:
++ swap_axes = 1;
++ 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 -Nur xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c
+--- xorg-server-1.7.0.orig/hw/xfree86/modes/xf86Crtc.c 2009-10-01 08:27:36.000000000 +0200
++++ xorg-server-1.7.0/hw/xfree86/modes/xf86Crtc.c 2009-10-08 11:28:42.000000000 +0200
+@@ -391,6 +391,12 @@
+ if (didLock)
+ crtc->funcs->unlock (crtc);
+
++ /*
++ * Rotate Touchscreen
++ */
++ xf86InputRotationNotify(crtc->rotation);
++
++
+ return ret;
+ }
+
More information about the Openembedded-commits
mailing list