aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-xserver
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-11-07 11:19:01 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2010-11-13 11:29:31 +0100
commitb2b4da7677c9c0398d68b14b79d90a2584bf1f33 (patch)
treeceb6b0e7a075c6f2fe01f162e274bdf933020e32 /recipes/xorg-xserver
parenta928bc53faf24a5a1ff47c1ec7a1c438cfedddd3 (diff)
downloadopenembedded-b2b4da7677c9c0398d68b14b79d90a2584bf1f33.tar.gz
xserver-xorg_git: bump SRCREV and add compatible xf86-input-evdev_git
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver')
-rw-r--r--recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch25
-rw-r--r--recipes/xorg-xserver/xserver-xorg_git.bb3
2 files changed, 27 insertions, 1 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch b/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch
new file mode 100644
index 0000000000..1d57466ef6
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg-1.9.99.1/0001-xf86Helper-fix-LogVMessageVerb-call.patch
@@ -0,0 +1,25 @@
+From 04bb25e427ce9e407599af9141c8591e51c1750b Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Thu, 11 Nov 2010 12:09:00 +0100
+Subject: [PATCH] xf86Helper: fix LogVMessageVerb call
+
+---
+ hw/xfree86/common/xf86Helper.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
+index 78e6b20..af08e00 100644
+--- a/hw/xfree86/common/xf86Helper.c
++++ b/hw/xfree86/common/xf86Helper.c
+@@ -1190,7 +1190,7 @@ xf86VIDrvMsgVerb(InputInfoPtr dev, MessageType type, int verb, const char *forma
+ char *msg;
+
+ msg = Xprintf("%s: %s: %s", dev->drv->driverName, dev->name, format);
+- LogVMessageVerb(type, verb, "%s", msg);
++ LogVMessageVerb(type, verb, format, args);
+ free(msg);
+ }
+
+--
+1.7.3.2
+
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index 8d99a3cbab..98831efe0b 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -12,8 +12,9 @@ PE = "2"
DEFAULT_PREFERENCE = "-1"
-SRCREV = "d738175eaf1098e29b8afb6de8e99b5098e366a7"
+SRCREV = "965e709f2b0b17f1e59e5aeb5e7717fede51ef97"
SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
+ file://0001-xf86Helper-fix-LogVMessageVerb-call.patch \
file://randr-support.patch \
file://hack-fbdev-ignore-return-mode.patch \
"