x11-base/xorg-server: add patch to fix KDrive's Xvesa build (fixes bug #235789)

4 files changed, 29 insertions, 4 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 0166f195c6ec..241bd628ca69 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.364 2008/10/22 15:42:26 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.365 2008/10/26 09:25:00 remi Exp $
+
+  26 Oct 2008; Rémi Cardona <remi@gentoo.org>
+  +files/1.5.2-fix-xvesa-with-new-kernels.patch, xorg-server-1.5.2.ebuild:
+  add patch to fix KDrive's Xvesa build (fixes bug #235789)
 
   22 Oct 2008; Rémi Cardona <remi@gentoo.org>
   xorg-server-1.3.0.0-r6.ebuild, xorg-server-1.4.2.ebuild,
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index a35e219f5479..215904a15dd2 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -33,6 +33,7 @@ AUX 1.4-fpic-libxf86config.patch 374 RMD160 614d69f83b7f4d4999efa906f2059b7f287e
 AUX 1.4-ia64.patch 1872 RMD160 6bc82c87140ee81150c34df486b5b4d9620dde9c SHA1 b43aadafd7ce144790cf9eccf8a9840baf3205bd SHA256 950714ce230791ce9d54e21044961d9435e4eb774f82e5047f9adcd5fd4661ec
 AUX 1.4.0.90-clean-generated-files.patch 595 RMD160 e4044e8c1f1b92db38a7e53b77109ff80fb4d22a SHA1 9eaf182c435946596462106547e9d52f819cb397 SHA256 8a57ddae701218b425bbe59c2d387c81d65af2d29c67ea9f8550c8201841f9a7
 AUX 1.5.1/0001-only-build-dri2-when-DRI2-is-enabled.patch 718 RMD160 04839af0a778bdc02090f04d906f498fc31504e9 SHA1 d8bdfdd36f4b69af6990e69947aa8d503f43b454 SHA256 58f511d956dcd801236f548bfe02162379a50698939fead338e4029aabdef30d
+AUX 1.5.2-fix-xvesa-with-new-kernels.patch 495 RMD160 dcf4213b088225a75af044fee0bed70eabe6a2fa SHA1 8a26839ed6a321175205ac68b72572652d2b534a SHA256 08735edbf6fd336412dfee94e087946af1c6e02d2fc348fa1e5a655e704df9c0
 AUX 1.5.2-force-LC_ALL-C-when-running-awk.patch 1505 RMD160 efd24cfd80d140c8ba5155c3feeddc6d41fbe85f SHA1 0f9c03b749717842052a9832d42e3fcdd3fdedb2 SHA256 45891f8e29f5df2ef68124b21756cd3d58f766fd1913b3668518bd99fc4ef14e
 AUX avoid-crash-on-minimized-xv-window.patch 1970 RMD160 a41e37359a05b4dc4c796e569b3f00e9dcb210d4 SHA1 54447e96f4f10e2993e0e675091f6026e63b56b6 SHA256 6e1cbe4f588674d70d3564962a79b4b7d271162040f9a2390f29f03cfeac87bd
 AUX use-composite-for-unequal-depths.patch 3528 RMD160 be7b5b07e8c890d596c5e2c49152f7df833487ea SHA1 1ade1846c1549c5a7eb3775d86973eb87bdb48ff SHA256 b38c079aaac0d8168cd4b45d2c1b8020338918c96855989dce89324c800622c0
@@ -52,6 +53,6 @@ DIST xorg-server-1.4.2.tar.bz2 6216638 RMD160 6f12b28d7e4186dfbdec3c9116c65e6831
 DIST xorg-server-1.5.2.tar.bz2 5615666 RMD160 a5693c99cf2b20a94c29cfd267a0bc27626d2914 SHA1 fc8b5ed20af34f504d55a004c35ebacbc603b339 SHA256 2ff9a6a280aaa8fe887c538e6099c0fdcfa94cb9dac800bde3b584cc9f325dc0
 EBUILD xorg-server-1.3.0.0-r6.ebuild 18356 RMD160 6c1611797bca8b0a27b5014a361804af5eb3363a SHA1 27e910f3215676611600af2cd386246468e64088 SHA256 b6a8d2eb16ed9fc7f49f39695097cb73483892e596e67a0c2a8cbcc6c28f836c
 EBUILD xorg-server-1.4.2.ebuild 17956 RMD160 1a24c2db2530cc8234728fbdcb82f20f6aabc618 SHA1 4b127d737b67c3a8d0064d164752ab98c0e89583 SHA256 24312fec19b6ff3594bee6c18b7477b63829ec127bb62f873de6b45dfdcaef7e
-EBUILD xorg-server-1.5.2.ebuild 16350 RMD160 ecd344e3967351852540f8b223d5f53f36270bf5 SHA1 229075da32bc1a7cc41c3fcecfe71dbae00fef49 SHA256 ed621c4b0819e2cf1887beb5ab9ad6d9138df115a792a21a352b212a3db1b890
-MISC ChangeLog 87903 RMD160 7740aa8b5e57e6f3b28dda75ea0800284d6eda51 SHA1 dee9b3a884cd43db15120a6cd1529db76b61b235 SHA256 8b029d95aa390074836143f2010d6a1bb6a794df814413ffc6918b7359a2f92b
+EBUILD xorg-server-1.5.2.ebuild 16404 RMD160 e58e393670d53969c97098ff510350b43a18e997 SHA1 5990e40be89eaf9cd49f3a5064c260ebfd87c747 SHA256 0fbdeb6fd03132cf10373df3ab0b62e01cd198d9b6b58768b8246169ba1e811f
+MISC ChangeLog 88086 RMD160 8480bd6f1f741f1bac22d6df24e2f54c35a6684d SHA1 639b64b6f1627c80b27abfea8da145c6055ee33f SHA256 5767ce3e5a72438c5e9cac4bd7fc6bf04527de29251da49e98a78968b3ed0093
 MISC metadata.xml 363 RMD160 6242c90a70b50a12d16ae53af775871766355562 SHA1 f50538064b1229c80204e9c84ff233749dd09bc5 SHA256 378597a2549cd07dd35551caf550f94f737118c40d17f9ac41eb4f5e2cfcae99
diff --git a/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
new file mode 100644
index 000000000000..2d0f4695fd60
--- /dev/null
+++ b/x11-base/xorg-server/files/1.5.2-fix-xvesa-with-new-kernels.patch
@@ -0,0 +1,19 @@
+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/x11-base/xorg-server/xorg-server-1.5.2.ebuild b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
index bbdaf5e89970..b02070ce97b6 100644
--- a/x11-base/xorg-server/xorg-server-1.5.2.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.6 2008/10/22 15:42:26 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.5.2.ebuild,v 1.7 2008/10/26 09:25:00 remi Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -280,6 +280,7 @@ GENTOO_PATCHES=(
 # These have been sent upstream
 UPSTREAMED_PATCHES=(
 	"${FILESDIR}/1.5.2-force-LC_ALL-C-when-running-awk.patch"
+	"${FILESDIR}/1.5.2-fix-xvesa-with-new-kernels.patch"
 )
 
 PATCHES=(