From 28e4e3b431456ad9ec587203e611376695afba95 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Fri, 14 Aug 2009 18:05:34 +0100
Subject: xserver-xf86-dri-lite: Update patches

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb |  2 +-
 meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb   | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'meta/packages/xorg-xserver')

diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb
index 83c5e93683..6a959ba5a2 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_1.6.0.bb
@@ -1,7 +1,7 @@
 require xserver-xf86-dri-lite.inc
 
 PE = "1"
-PR = "r2"
+PR = "r3"
 
 PROTO_DEPS += "xf86driproto dri2proto"
 
diff --git a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
index ebc18116b1..2eeff95a1a 100644
--- a/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/packages/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -1,17 +1,23 @@
 require xserver-xf86-dri-lite.inc
 
 PE = "1"
-PR = "r5"
+PR = "r9"
 PV = "1.6.0+git${SRCPV}"
 
 PROTO_DEPS += "xf86driproto dri2proto"
 
 RDEPENDS_${PN} += "xkeyboard-config"
 
+#           file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1 \
+#           file://xserver-1.5.0-bg-none-root.patch;patch=1 \
+#           file://xserver-no-root-2.patch;patch=1 \
+#           file://xserver-boottime.patch;patch=1"
+#           file://xserver-DRI2Swapbuffer.patch;patch=1"
+
+
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=server-1.6-branch \
-	   file://nodolt.patch;patch=1 \
-           file://libdri-xinerama-symbol.patch;patch=1 \
-           file://xserver-boottime.patch;patch=1"
+           file://nodolt.patch;patch=1 \
+           file://libdri-xinerama-symbol.patch;patch=1"
 
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"
-- 
cgit v1.2.3