From c11e9cdc67a942221616ec894e1e551d04825805 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 17 May 2007 09:33:01 +0000
Subject: xserver-kdrive 1.3.0.0: Tweak patches

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1742 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/xorg-xserver/xserver-kdrive-common.inc | 4 +++-
 meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-common.inc b/meta/packages/xorg-xserver/xserver-kdrive-common.inc
index ff894586a..625653c61 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-common.inc
+++ b/meta/packages/xorg-xserver/xserver-kdrive-common.inc
@@ -105,7 +105,9 @@ KDRIVE_COMMON_PATCHES = " \
 
 SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-PACKAGE_ARCH_poodle = "poodle"
+SRC_URI_append_qemux86 = " file://xserver-kdrive-poodle.patch;patch=1"
+PACKAGE_ARCH_poodle = "${MACHINE_ARCH}"
+PACKAGE_ARCH_qemux86 = "${MACHINE_ARCH}"
 
 inherit autotools pkgconfig
 
diff --git a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index a8df78bd5..a10690416 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@ -3,11 +3,12 @@ require xserver-kdrive-common.inc
 DEPENDS += "libxkbfile libxcalibrate"
 
 PE = "1"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
         file://fix_default_mode.patch;patch=1 \
-	file://enable-xcalibrate.patch;patch=1 "
+	file://enable-xcalibrate.patch;patch=1 \
+	file://hide-cursor-and-ppm-root.patch;patch=1"
 
 S = "${WORKDIR}/xorg-server-${PV}"
-- 
cgit v1.2.3