Module Name: xsrc
Committed By: jmcneill
Date: Sun Feb 9 12:53:19 UTC 2020
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86AutoConfig.c
Log Message:
Don't autoload vesa on x86 at all as it conflicts with wsfb.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.16 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.17
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c:1.16 Sun Feb 9 11:40:14 2020
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86AutoConfig.c Sun Feb 9 12:53:19 2020
@@ -361,7 +361,7 @@ listPossibleVideoDrivers(XF86MatchedDriv
#endif
/* Fallback to platform default hardware */
-#if defined(__i386__) || defined(__amd64__) || defined(__hurd__)
+#if (defined(__i386__) || defined(__amd64__) || defined(__hurd__)) && !defined(__NetBSD__)
xf86AddMatchedDriver(md, "vesa");
#elif defined(__sparc__) && !defined(__sun)
xf86AddMatchedDriver(md, "sunffb");
