Fix crashes of 'XFree86-4 -configure' on systems with i810 video

PR:		ports/22386
Submitted by:	Jay Krell <jay.krell@cornell.edu>
This commit is contained in:
Jean-Marc Zucconi 2000-11-03 16:36:14 +00:00
parent 67c29fddb0
commit 524cbcbb57
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=34757
2 changed files with 23 additions and 1 deletions

View File

@ -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}

View File

@ -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;