[oe-commits] kergoth : xserver-kdrive: apply vm86_masks.patch to 1.4.2 also

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: eb0440f81bad74154588c761036bd3504161be14
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eb0440f81bad74154588c761036bd3504161be14

Author: kergoth <kergoth at .(none)>
Date:   Fri Feb 19 10:05:32 2010 -0700

xserver-kdrive: apply vm86_masks.patch to 1.4.2 also

Signed-off-by: kergoth <kergoth at .(none)>

---

 .../xserver-kdrive-1.4.2/vm86_masks.patch          |   20 ++++++++++++++++++++
 recipes/xorg-xserver/xserver-kdrive_1.4.2.bb       |    3 ++-
 2 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.2/vm86_masks.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.2/vm86_masks.patch
new file mode 100644
index 0000000..b004488
--- /dev/null
+++ b/recipes/xorg-xserver/xserver-kdrive-1.4.2/vm86_masks.patch
@@ -0,0 +1,20 @@
+See https://bugs.gentoo.org/show_bug.cgi?id=235789
+2008-09-09 Martin von Gagern
+
+--- xorg-server-1.5.0.orig/hw/kdrive/vesa/vm86.h	2008-09-09 17:24:59.000000000 +0200
++++ xorg-server-1.5.0/hw/kdrive/vesa/vm86.h	2008-09-09 18:01:53.000000000 +0200
+@@ -67,6 +67,13 @@
+ #include "os.h"
+ #endif
+ 
++#ifndef IF_MASK
++#define IF_MASK X86_EFLAGS_IF
++#endif
++#ifndef IOPL_MASK
++#define IOPL_MASK X86_EFLAGS_IOPL
++#endif
++
+ typedef unsigned char	U8;
+ typedef unsigned short	U16;
+ typedef unsigned int	U32;
+
diff --git a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
index d0b7ac1..9a60744 100644
--- a/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
+++ b/recipes/xorg-xserver/xserver-kdrive_1.4.2.bb
@@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman"
 RDEPENDS += "hal"
 
 PE = "1"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	${KDRIVE_COMMON_PATCHES} \
@@ -25,6 +25,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
 	file://xorg-avr32-support.diff;patch=1 \
 	file://pkgconfig_fix.patch;patch=1 \
         file://no_xkb.patch;patch=1;pnum=0 \
+	file://vm86_masks.patch;patch=1 \
         "
 
 S = "${WORKDIR}/xorg-server-${PV}"