[oe-commits] Martin.Jansa : shr/merge xorg-xserver: move patches for 1. 7 series to common directory
git version control
git at git.openembedded.org
Wed Oct 14 10:28:44 UTC 2009
Module: openembedded.git
Branch: shr/merge
Commit: 0e0768c7ca799f7f7b4dc92563495aca9f7122d3
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=0e0768c7ca799f7f7b4dc92563495aca9f7122d3
Author: Martin.Jansa <Martin.Jansa at gmail.com>
Date: Tue Oct 13 19:54:35 2009 +0000
shr/merge xorg-xserver: move patches for 1.7 series to common directory
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>
---
conf/checksums.ini | 4 +
.../xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch | 21 -----
.../xserver-xorg-1.7.0/randr-support-1.7.0.patch | 96 --------------------
.../dolt-fix-1.7.0.patch} | 5 +-
.../randr-support-1.7.0.patch | 0
recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb | 2 +-
recipes/xorg-xserver/xserver-xorg_1.7.0.bb | 2 +-
7 files changed, 9 insertions(+), 121 deletions(-)
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a896f47..647dfae 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -29702,6 +29702,10 @@ sha256=b6ec7a0d0c2aa227b1ca7376e820979f439f10d2c53d707758742dcc0e148192
md5=3a2f20ebbeeae5c13f7a78df314b1164
sha256=bafeea3f317e804013065a5659fa4743820d18ff361cbab178ea08134e6f1e06
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.0.901.tar.bz2]
+md5=38c5cfbb5bda671aed9f390e9b7c34b4
+sha256=3ca91ab03a04b1376d917ca9953052f370bc59f00964f9ba5b92d4171ebb1d71
+
[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.0.tar.bz2]
md5=e0b70d3d542959f677210172d2b0f237
sha256=e55996b1e4217f84c61fd8d1126d7171295d83ddfaa63c5c516c63bf4703a6c4
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch
deleted file mode 100644
index 414d72d..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/randr-support-1.7.0.patch b/recipes/xorg-xserver/xserver-xorg-1.7.0/randr-support-1.7.0.patch
deleted file mode 100644
index fb8d381..0000000
--- a/recipes/xorg-xserver/xserver-xorg-1.7.0/randr-support-1.7.0.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-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;
- }
-
diff --git a/recipes/xorg-xserver/xserver-xorg-1.7.0.901/dolt-fix.patch b/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch
similarity index 83%
rename from recipes/xorg-xserver/xserver-xorg-1.7.0.901/dolt-fix.patch
rename to recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch
index 414d72d..e332ce0 100644
--- a/recipes/xorg-xserver/xserver-xorg-1.7.0.901/dolt-fix.patch
+++ b/recipes/xorg-xserver/xserver-xorg/dolt-fix-1.7.0.patch
@@ -1,7 +1,7 @@
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
+--- xorg-server.orig/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400
++++ xorg-server/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400
@@ -147,7 +147,7 @@
cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
#!$DOLT_BASH
@@ -19,3 +19,4 @@ Index: xorg-server/m4/dolt.m4
+ 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/randr-support-1.7.0.patch
similarity index 100%
rename from recipes/xorg-xserver/xserver-xorg-1.7.0.901/randr-support-1.7.0.patch
rename to recipes/xorg-xserver/xserver-xorg/randr-support-1.7.0.patch
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb b/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
index 58b3614..5095a0b 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.0.901.bb
@@ -6,7 +6,7 @@ PE = "2"
PR = "r1"
SRC_URI += "file://sysroot_fix.patch;patch=1 \
- file://dolt-fix.patch;patch=1 \
+ file://dolt-fix-1.7.0.patch;patch=1 \
file://randr-support-1.7.0.patch;patch=1 \
"
do_install_prepend() {
diff --git a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb b/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
index 58b3614..5095a0b 100644
--- a/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
+++ b/recipes/xorg-xserver/xserver-xorg_1.7.0.bb
@@ -6,7 +6,7 @@ PE = "2"
PR = "r1"
SRC_URI += "file://sysroot_fix.patch;patch=1 \
- file://dolt-fix.patch;patch=1 \
+ file://dolt-fix-1.7.0.patch;patch=1 \
file://randr-support-1.7.0.patch;patch=1 \
"
do_install_prepend() {
More information about the Openembedded-commits
mailing list