aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlesi <lesi@FreeBSD.org>2004-09-03 05:34:24 +0800
committerlesi <lesi@FreeBSD.org>2004-09-03 05:34:24 +0800
commit8ef4f87e84fe27e861db375c351d18107b622f0d (patch)
tree77851679442014e6883121591b129edba396d572
parent87599270d3dd913e8daf2d7cf664675a6d82350c (diff)
downloadfreebsd-ports-gnome-8ef4f87e84fe27e861db375c351d18107b622f0d.tar.gz
freebsd-ports-gnome-8ef4f87e84fe27e861db375c351d18107b622f0d.tar.zst
freebsd-ports-gnome-8ef4f87e84fe27e861db375c351d18107b622f0d.zip
Fix problem with XVideo (insufficient resources for operation).
PR: ports/70317 Approved by: anholt (mentor) Obtained from: Free Desktop.Org Bugzilla #474
-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)