summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Baergen <joshuabaergen@gentoo.org>2006-09-03 14:48:35 +0000
committerJoshua Baergen <joshuabaergen@gentoo.org>2006-09-03 14:48:35 +0000
commit71eb10d51b843c5c441baaea34684a93c239d89a (patch)
tree6390e8aeb0cb3a5029f9a9d45c4afdedf2653e18 /x11-base
parentStable on ia64. (diff)
downloadgentoo-2-71eb10d51b843c5c441baaea34684a93c239d89a.tar.gz
gentoo-2-71eb10d51b843c5c441baaea34684a93c239d89a.tar.bz2
gentoo-2-71eb10d51b843c5c441baaea34684a93c239d89a.zip
kdrive's VESA driver does not build on AMD64. (Bruno Roggeri, bug #145274)
(Portage version: 2.1.1_rc1-r2)
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild9
-rw-r--r--x11-base/xorg-server/xorg-server-1.1.1.ebuild9
3 files changed, 21 insertions, 3 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 10b9e09bac29..8078b81a043c 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.161 2006/08/27 08:27:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.162 2006/09/03 14:48:35 joshuabaergen Exp $
+
+ 03 Sep 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+ xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
+ kdrive's VESA driver does not build on AMD64. (Bruno Roggeri, bug #145274)
27 Aug 2006; Donnie Berkholz <dberkholz@gentoo.org>;
xorg-server-1.1.0-r1.ebuild, xorg-server-1.1.1.ebuild:
diff --git a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
index 5b5ab5a9a6ae..0fd1babb29a4 100644
--- a/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.1.0-r1.ebuild,v 1.18 2006/08/27 08:27:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.0-r1.ebuild,v 1.19 2006/09/03 14:48:35 joshuabaergen Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -501,6 +501,13 @@ LICENSE="${LICENSE} MIT"
pkg_setup() {
use minimal || ensure_a_server_is_building
+ # Bug #145274 - anything that uses vm86.h is broken on AMD64
+ if use kdrive && use amd64 && use video_cards_vesa; then
+ eerror "kdrive's VESA driver does not build on AMD64 because it uses"
+ eerror "vm86.h. Please build kdrive without VIDEO_CARDS=\"vesa\"."
+ die "kdrive's VESA driver does not build on AMD64."
+ fi
+
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies
diff --git a/x11-base/xorg-server/xorg-server-1.1.1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
index 1b34ec4b4b76..7dc06c4ac73e 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.1.1.ebuild,v 1.15 2006/08/27 08:27:05 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1.ebuild,v 1.16 2006/09/03 14:48:35 joshuabaergen Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -272,6 +272,13 @@ LICENSE="${LICENSE} MIT"
pkg_setup() {
use minimal || ensure_a_server_is_building
+ # Bug #145274 - anything that uses vm86.h is broken on AMD64
+ if use kdrive && use amd64 && use video_cards_vesa; then
+ eerror "kdrive's VESA driver does not build on AMD64 because it uses"
+ eerror "vm86.h. Please build kdrive without VIDEO_CARDS=\"vesa\"."
+ die "kdrive's VESA driver does not build on AMD64."
+ fi
+
# localstatedir is used for the log location; we need to override the default
# from ebuild.sh
# sysconfdir is used for the xorg.conf location; same applies