diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-12 13:07:14 +0100 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-12 13:07:14 +0100 |
| commit | 3516e365b5f29fb1c09e4a7351e92b6ceb250d72 (patch) | |
| tree | 8910657328306284c36dd8ff1dec9d0d24700ffb /recipes/xorg-xserver | |
| parent | 2297bad128f73f878dc28a5c365c4d624e400058 (diff) | |
| parent | 4df23cb65d9d526f3a2dc5df13bddb0a14da1b0c (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/xorg-xserver')
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive-1.4.0.90/vm86_masks.patch | 20 | ||||
| -rw-r--r-- | recipes/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 3 |
2 files changed, 22 insertions, 1 deletions
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}" |