diff options
| author | lesi <lesi@FreeBSD.org> | 2004-09-03 05:46:08 +0800 |
|---|---|---|
| committer | lesi <lesi@FreeBSD.org> | 2004-09-03 05:46:08 +0800 |
| commit | 98ce951e33d6392d86124730694d6e0c3699b3ae (patch) | |
| tree | 00222da214336bdf0c7664ef9fc2802924c30d18 /x11-servers/xorg-server | |
| parent | d2c5ba566caa65d9327c888f88f587fec227381d (diff) | |
| download | freebsd-ports-gnome-98ce951e33d6392d86124730694d6e0c3699b3ae.tar.gz freebsd-ports-gnome-98ce951e33d6392d86124730694d6e0c3699b3ae.tar.zst freebsd-ports-gnome-98ce951e33d6392d86124730694d6e0c3699b3ae.zip | |
Fix problem with XVideo (insufficient resources for operation). [1]
Use correct prototype for sysarch(2). [2]
PR: ports/70317 [1], ports/71037 [2]
Submitted by: Andrew Elmore (aelmore at interwoven.com) [2]
Approved by: anholt (mentor)
Obtained from: Free Desktop.Org Bugzilla #474 [1]
Diffstat (limited to 'x11-servers/xorg-server')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/Makefile.inc | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-alpha_video.c | 11 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-xf86fbman.c | 17 |
4 files changed, 31 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 8c097b4c097d..e850ae787b36 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -7,7 +7,7 @@ PORTNAME= server PORTVERSION= 6.7.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-servers MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ ${MASTER_SITE_XORG} diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 0700d273c508..8c3886ff7997 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -40,6 +40,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-alpha_video.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-bus-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ @@ -47,6 +48,7 @@ SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefil ${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c diff --git a/x11-servers/xorg-server/files/patch-alpha_video.c b/x11-servers/xorg-server/files/patch-alpha_video.c new file mode 100644 index 000000000000..15ff05b7c4a0 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-alpha_video.c @@ -0,0 +1,11 @@ +--- programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c.orig Wed Sep 1 21:05:09 2004 ++++ programs/Xserver/hw/xfree86/os-support/bsd/alpha_video.c Wed Sep 1 21:06:52 2004 +@@ -487,7 +487,7 @@ + writeSparse32(int Value, pointer Base, register unsigned long Offset); + + #ifdef __FreeBSD__ +-extern int sysarch(int, char *); ++extern int sysarch(int, void *); + #endif + + struct parms { diff --git a/x11-servers/xorg-server/files/patch-xf86fbman.c b/x11-servers/xorg-server/files/patch-xf86fbman.c new file mode 100644 index 000000000000..1d6fcc88f041 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-xf86fbman.c @@ -0,0 +1,17 @@ +--- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Wed Nov 26 23:48:58 2003 ++++ programs/Xserver/hw/xfree86/common/xf86fbman.c Wed Sep 1 21:15:58 2004 +@@ -1095,12 +1095,10 @@ + + *size = 0; + +- if (!offman->LinearAreas) return FALSE; +- + pLink = offman->LinearAreas; +- pLinkRet = pLink; + +- if (!pLink->area) { ++ if (pLink && !pLink->area) { ++ pLinkRet = pLink; + while (pLink) { + if (pLink->free) { + if (pLink->linear.size > pLinkRet->linear.size) |