aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmz <jmz@FreeBSD.org>2000-11-04 00:36:14 +0800
committerjmz <jmz@FreeBSD.org>2000-11-04 00:36:14 +0800
commitf03d269fb4079075f7e3fdcef5c1da5be077bd8c (patch)
treeb1e52ae8470872296c9597f7e3f5010e491e4127
parent060c093b301987dc9687f9104d477c0a0a55ad57 (diff)
downloadfreebsd-ports-gnome-f03d269fb4079075f7e3fdcef5c1da5be077bd8c.tar.gz
freebsd-ports-gnome-f03d269fb4079075f7e3fdcef5c1da5be077bd8c.tar.zst
freebsd-ports-gnome-f03d269fb4079075f7e3fdcef5c1da5be077bd8c.zip
Fix crashes of 'XFree86-4 -configure' on systems with i810 video
PR: ports/22386 Submitted by: Jay Krell <jay.krell@cornell.edu>
-rw-r--r--x11/XFree86-4/Makefile2
-rw-r--r--x11/XFree86-4/files/patch-m22
2 files changed, 23 insertions, 1 deletions
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index 25cd93aa7016..5f3dd91267b9 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 4.0.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
diff --git a/x11/XFree86-4/files/patch-m b/x11/XFree86-4/files/patch-m
new file mode 100644
index 000000000000..62d0456a29fa
--- /dev/null
+++ b/x11/XFree86-4/files/patch-m
@@ -0,0 +1,22 @@
+--- programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c.1 Sat Oct 28 21:59:54 2000
++++ programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Sat Oct 28 22:03:34 2000
+@@ -391,6 +391,9 @@
+ devSections, numDevSections,
+ drv, &usedChips);
+
++ if (flags & PROBE_DETECT)
++ foundScreen = TRUE;
++ else
+ for (i=0; i<numUsed; i++) {
+ ScrnInfoPtr pScrn = NULL;
+ /* Allocate new ScrnInfoRec and claim the slot */
+@@ -435,6 +438,8 @@
+ char *mod=0, *reqSym=0;
+ int flags24;
+ rgb defaultWeight = {0, 0, 0};
++
++ if (flags & PROBE_DETECT) return FALSE;
+
+ if (pScrn->numEntities != 1) return FALSE;
+
+