diff options
| author | kergoth <kergoth@.(none)> | 2010-02-19 10:05:32 -0700 |
|---|---|---|
| committer | kergoth <kergoth@.(none)> | 2010-02-19 10:05:32 -0700 |
| commit | eb0440f81bad74154588c761036bd3504161be14 (patch) | |
| tree | 69144ddfc25bcb9119be789145554f9261c3e930 | |
| parent | 33a15ddec7f3b19dec610f6b600fc0b5505a7a34 (diff) | |
xserver-kdrive: apply vm86_masks.patch to 1.4.2 also
Signed-off-by: kergoth <kergoth@.(none)>
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive-1.4.2/vm86_masks.patch | 20 | ||||
| -rw-r--r-- | 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 0000000000..b0044886e5 --- /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 d0b7ac17e0..9a6074422a 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}" |