diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-11-03 16:36:14 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-11-03 16:36:14 +0000 |
| commit | 524cbcbb572b1444ca5e9b24509aa0956c66d95a (patch) | |
| tree | 4736d91da5e2d8997c15deb4153ec5eb3797945f /x11 | |
| parent | Initialise Deorbiting Burn Sequence [tm, (c) 2000, PHK] for pnmtopng port. (diff) | |
Fix crashes of 'XFree86-4 -configure' on systems with i810 video
PR: ports/22386
Submitted by: Jay Krell <jay.krell@cornell.edu>
Notes
Notes:
svn path=/head/; revision=34757
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-4/Makefile | 2 | ||||
| -rw-r--r-- | x11/XFree86-4/files/patch-m | 22 |
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; + + |