kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix problem with XVideo (insufficient resources for operation). [1]

Browse source 
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]
This commit is contained in:
Dejan Lesjak 2004-09-02 21:46:08 +00:00
parent 9f6c874fa1
commit ab67e24779
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=117977
8 changed files with 62 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
x11-servers/xorg-server-snap/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= server PORTNAME= server
PORTVERSION= 6.7.0 PORTVERSION= 6.7.0
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= x11-servers CATEGORIES= x11-servers
MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
${MASTER_SITE_XORG} ${MASTER_SITE_XORG}

2
x11-servers/xorg-server-snap/Makefile.inc
View file

@ -40,6 +40,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ 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-bus-Imakefile \
${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \
${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ ${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-man-Imakefile \
${PORTSDIR}/x11-servers/xorg-server/files/patch-os-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-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-xf86sym.c \
${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \
${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c

11
x11-servers/xorg-server-snap/files/patch-alpha_video.c Normal file
View file

@ -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 {

17
x11-servers/xorg-server-snap/files/patch-xf86fbman.c Normal file
View file

@ -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)

2
x11-servers/xorg-server/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= server PORTNAME= server
PORTVERSION= 6.7.0 PORTVERSION= 6.7.0
PORTREVISION= 6 PORTREVISION= 7
CATEGORIES= x11-servers CATEGORIES= x11-servers
MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \ MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/ \
${MASTER_SITE_XORG} ${MASTER_SITE_XORG}

2
x11-servers/xorg-server/Makefile.inc
View file

@ -40,6 +40,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl ${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
SERVER_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefile \ 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-bus-Imakefile \
${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-fb-renderfixes.diff \
${PORTSDIR}/x11-servers/xorg-server/files/patch-kernel-Imakefile \ ${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-man-Imakefile \
${PORTSDIR}/x11-servers/xorg-server/files/patch-os-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-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-xf86sym.c \
${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \
${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c ${PORTSDIR}/x11-servers/xorg-server/files/patch-xkbout.c

11
x11-servers/xorg-server/files/patch-alpha_video.c Normal file
View file

@ -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 {

17
x11-servers/xorg-server/files/patch-xf86fbman.c Normal file
View file

@ -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)