aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorDejan Lesjak <lesi@FreeBSD.org>2004-09-02 21:34:24 +0000
committerDejan Lesjak <lesi@FreeBSD.org>2004-09-02 21:34:24 +0000
commitbaee44bc4d765db28f5d4d0d71c801cb83ebe61f (patch)
treec3641479bf02f6f6bc79dc9bf7c723b1b0dd1530 /x11-servers
parentf2bc67e5ae5ee4ba39235bdaef3fa2ba27f84c5c (diff)
downloadports-baee44bc4d765db28f5d4d0d71c801cb83ebe61f.tar.gz
ports-baee44bc4d765db28f5d4d0d71c801cb83ebe61f.zip
Fix problem with XVideo (insufficient resources for operation).
PR: ports/70317 Approved by: anholt (mentor) Obtained from: Free Desktop.Org Bugzilla #474
Notes
Notes: svn path=/head/; revision=117973
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server/Makefile2
-rw-r--r--x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c17
2 files changed, 18 insertions, 1 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index a551fdcc63a0..8d9fa733df75 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= Server
PORTVERSION= 4.4.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
diff --git a/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c
new file mode 100644
index 000000000000..54a57504a4bc
--- /dev/null
+++ b/x11-servers/XFree86-4-Server/files/patch-programs::Xserver::hw::xfree86::common::xf86fbman.c
@@ -0,0 +1,17 @@
+--- programs/Xserver/hw/xfree86/common/xf86fbman.c.orig Sat Aug 28 13:14:32 2004
++++ programs/Xserver/hw/xfree86/common/xf86fbman.c Sat Aug 28 13:16:03 2004
+@@ -1115,12 +1115,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)