Module Name: xsrc
Committed By: jmcneill
Date: Sun Oct 9 15:11:35 UTC 2011
Modified Files:
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Helper.c
Log Message:
xsrc/45442: X -configure doesn't detect S3 Trio32/64
Backout the following commit from upstream:
http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Helper.c?id=0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05
Despite what the log message says, xf86MatchDevice can be called at
configure time by drivers who still implement the legacy probing API (and
there are a lot of them!).
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.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/xf86Helper.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.1.1.4 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.2
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c:1.1.1.4 Tue Aug 2 06:56:54 2011
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c Sun Oct 9 15:11:35 2011
@@ -1400,6 +1400,16 @@ xf86MatchDevice(const char *drivername,
*sectlist = NULL;
/*
+ * 20111009 jmcneill: This line was removed with the following commit upstream:
+ * http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Helper.c?id=0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05
+ *
+ * However, the log message is inaccurate: xf86MatchDevice will get called at
+ * configuration time by drivers who still implement the legacy probing
+ * API.
+ */
+ if (xf86DoConfigure && xf86DoConfigurePass1) return 1;
+
+ /*
* This can happen when running Xorg -showopts and a module like ati
* or vmware tries to load its submodules when xf86ConfigLayout is empty
*/
