xserver-xorg_git: bump SRCREV and add compatible xf86-input-evdev_git

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/xorg-driver/xf86-input-evdev_git.bb b/recipes/xorg-driver/xf86-input-evdev_git.bb
new file mode 100644 (file)
index 0000000..8fb740a
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-evdev_git.bb
@@ -0,0 +1,10 @@
+require xorg-driver-input.inc
+DESCRIPTION = "X.Org X server -- evdev input driver"
+PE = "1"
+PV = "2.5.0+gitr${SRCPV}"
+PR = "${INC_PR}.0"
+DEFAULT_PREFERENCE = "-1"
+
+SRCREV = "a4aefca2ed52e675e6151a0fb0742a9e19565a41"
+SRC_URI = "git://anongit.freedesktop.org/xorg/driver/${PN};protocol=git;branch=master"
+S = "${WORKDIR}/git"

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 (file)
index 0000000..1d57466
--- /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 8d99a3c..98831ef 100644 (file)
--- 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 \
            "