From d2c71f90a9a5089661472607029d42196f1623da Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 10 Dec 2009 11:34:48 -0800 Subject: xserver-kdrive_1.4.0.90.bb: Add patch to define IF_MASK. * This patch is applied to 1.5.3, therefore versions older than that will need this patch to compile xserver-kdrive Signed-off-by: Jay Snyder Signed-off-by: Khem Raj --- .../xserver-kdrive-1.4.0.90/vm86_masks.patch | 20 ++++++++++++++++++++ recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 3 ++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch (limited to 'recipes/xorg-xserver') diff --git a/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch new file mode 100644 index 0000000000..b0044886e5 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-1.4.0.90/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.0.90.bb b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb index 0b347aad7b..b6322769ab 100644 --- a/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -4,7 +4,7 @@ DEPENDS += "hal libxkbfile libxcalibrate pixman" RDEPENDS += "hal" PE = "1" -PR = "r7" +PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ @@ -27,6 +27,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ file://no_xkb.patch;patch=1;pnum=0 \ file://xorg-1.4-kdrive-rotation.patch;patch=1 \ file://split_multiple_AC_SUBST.patch;patch=1 \ + file://vm86_masks.patch;patch=1 \ " S = "${WORKDIR}/xorg-server-${PV}" -- cgit v1.2.3