aboutsummaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorDejan Lesjak <lesi@FreeBSD.org>2004-09-02 21:46:08 +0000
committerDejan Lesjak <lesi@FreeBSD.org>2004-09-02 21:46:08 +0000
commitab67e24779f1c2d8463a49a78ef3f0910f1423d6 (patch)
tree9d0f69f69b5dbd2f613cee26ecf50a83fcabcfb6 /x11-servers
parent9f6c874fa1cfaa72a87804bb6250236d171d3c79 (diff)
downloadports-ab67e24779f1c2d8463a49a78ef3f0910f1423d6.tar.gz
ports-ab67e24779f1c2d8463a49a78ef3f0910f1423d6.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]
Notes
Notes: svn path=/head/; revision=117977
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server-snap/Makefile2
-rw-r--r--x11-servers/xorg-server-snap/Makefile.inc2
-rw-r--r--x11-servers/xorg-server-snap/files/patch-alpha_video.c11
-rw-r--r--x11-servers/xorg-server-snap/files/patch-xf86fbman.c17
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-servers/xorg-server/Makefile.inc2
-rw-r--r--x11-servers/xorg-server/files/patch-alpha_video.c11
-rw-r--r--x11-servers/xorg-server/files/patch-xf86fbman.c17
8 files changed, 62 insertions, 2 deletions
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index 8c097b4c097d..e850ae787b36 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/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-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc
index 0700d273c508..8c3886ff7997 100644
--- a/x11-servers/xorg-server-snap/Makefile.inc
+++ b/x11-servers/xorg-server-snap/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-snap/files/patch-alpha_video.c b/x11-servers/xorg-server-snap/files/patch-alpha_video.c
new file mode 100644
index 000000000000..15ff05b7c4a0
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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-snap/files/patch-xf86fbman.c b/x11-servers/xorg-server-snap/files/patch-xf86fbman.c
new file mode 100644
index 000000000000..1d6fcc88f041
--- /dev/null
+++ b/x11-servers/xorg-server-snap/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)
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 06:35:02 +0000