[oe-commits] Martin Jansa : xserver-xorg_git: fix build after mesa 61d26bc82e7c4100acfb551cbb0ba9d84bbc4ba5

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 2613ee5ac52f1eebb6c3aab0372e93c222ae3f0b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2613ee5ac52f1eebb6c3aab0372e93c222ae3f0b

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Feb 19 00:41:20 2010 +0100

xserver-xorg_git: fix build after mesa 61d26bc82e7c4100acfb551cbb0ba9d84bbc4ba5

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

---

 ...shInvalidate-was-renamed-to-invalidate-in.patch |   25 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-xorg_git.bb           |    3 +-
 2 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-xorg/0001-glxdri2-flushInvalidate-was-renamed-to-invalidate-in.patch b/recipes/xorg-xserver/xserver-xorg/0001-glxdri2-flushInvalidate-was-renamed-to-invalidate-in.patch
new file mode 100644
index 0000000..697bbb4
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-xorg/0001-glxdri2-flushInvalidate-was-renamed-to-invalidate-in.patch
@@ -0,0 +1,25 @@
+From afb5e0c9c3a9421c6e05b5a0f61c7e8ab67d4cc6 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Fri, 19 Feb 2010 00:24:06 +0100
+Subject: [PATCH] glxdri2: flushInvalidate was renamed to invalidate in http://cgit.freedesktop.org/mesa/mesa/commit/?id=debf00e5fc3828f63e0f99d72c7fa6cd6ce012c5
+
+---
+ glx/glxdri2.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/glx/glxdri2.c b/glx/glxdri2.c
+index 0f998de..a98b522 100644
+--- a/glx/glxdri2.c
++++ b/glx/glxdri2.c
+@@ -218,7 +218,7 @@ __glXDRIdrawableSwapBuffers(ClientPtr client, __GLXdrawable *drawable)
+     CARD64 unused;
+ 
+     if (screen->flush)
+-	(*screen->flush->flushInvalidate)(priv->driDrawable);
++	(*screen->flush->invalidate)(priv->driDrawable);
+ 
+     if (DRI2SwapBuffers(client, drawable->pDraw, 0, 0, 0, &unused,
+ 			__glXdriSwapEvent, drawable->pDraw) != Success)
+-- 
+1.7.0
+
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index e7ce3c8..378aae2 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PV = "1.7.999"
-PR = "r0"
+PR = "r1"
 PR_append = "+gitr${SRCREV}"
 PE = "2"
 
@@ -11,6 +11,7 @@ DEFAULT_PREFERENCE = "-1"
 
 SRCREV = "84905007702da2c05a4f7446b3fc5ff52be49655"
 SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git;branch=master \
+           file://0001-glxdri2-flushInvalidate-was-renamed-to-invalidate-in.patch;patch=1 \
            file://dolt-fix-1.7.0.patch;patch=1 \
            file://randr-support-1.7.0.patch;patch=1 \
            "