Module Name: src
Committed By: macallan
Date: Thu Jan 6 03:29:12 UTC 2011
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10: Makefile
Log Message:
define NO_LEGACY_VGA on macppc and sparc64
May be necessary on other ports as well that have PCI but never use VGA text
mode.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile:1.6 Thu Nov 25 16:02:02 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/int10/Makefile Thu Jan 6 03:29:12 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/25 16:02:02 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2011/01/06 03:29:12 macallan Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules
@@ -18,6 +18,11 @@
CPPFLAGS+= -D_PC
.endif
+# do not muck around in IO space trying to enable / disable non-PCI VGAs
+.if ${MACHINE} == "macppc" || ${MACHINE} == "sparc64"
+CPPFLAGS+= -DNO_LEGACY_VGA
+.endif
+
CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/xfree86/common \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support \
-I${X11SRCDIR.xorg-server}/hw/xfree86/os-support/bus \
