diff options
5 files changed, 59 insertions, 0 deletions
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc index 0ef287420193..d7abe96318f4 100644 --- a/x11-servers/xorg-server/Makefile.inc +++ b/x11-servers/xorg-server/Makefile.inc @@ -42,6 +42,8 @@ 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-Xserver-Xext-xvmc.c \ + ${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-servermd.h \ ${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c diff --git a/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c b/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c new file mode 100644 index 000000000000..6a9380e4526a --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xserver-Xext-xvmc.c @@ -0,0 +1,14 @@ +Index: programs/Xserver/Xext/xvmc.c +diff -u -p programs/Xserver/Xext/xvmc.c.orig programs/Xserver/Xext/xvmc.c +--- programs/Xserver/Xext/xvmc.c.orig Sun Jul 3 17:53:36 2005 ++++ programs/Xserver/Xext/xvmc.c Thu Jan 26 14:22:20 2006 +@@ -24,8 +24,8 @@ + + #ifdef HAS_XVMCSHM + #ifndef Lynx +-#include <sys/ipc.h> + #include <sys/types.h> ++#include <sys/ipc.h> + #include <sys/shm.h> + #else + #include <ipc.h> diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c new file mode 100644 index 000000000000..129b262f1365 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c @@ -0,0 +1,18 @@ +Index: programs/Xserver/hw/xfree86/common/xf86Config.c +diff -u -p programs/Xserver/hw/xfree86/common/xf86Config.c.orig programs/Xserver/hw/xfree86/common/xf86Config.c +--- programs/Xserver/hw/xfree86/common/xf86Config.c.orig Wed Dec 21 07:30:50 2005 ++++ programs/Xserver/hw/xfree86/common/xf86Config.c Thu Jan 26 15:10:39 2006 +@@ -505,8 +505,12 @@ GenerateDriverlist(char * dirname, char + { + #ifdef XFree86LOADER + char **ret; +- char *subdirs[] = { dirname, NULL }; ++ char *subdirs[2]; + static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL}; ++ ++ subdirs[0] = dirname; ++ subdirs[1] = NULL; ++ + ret = LoaderListDirs(subdirs, patlist); + + /* fix up the probe order for video drivers */ diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c new file mode 100644 index 000000000000..8fc64d32fb67 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-i386_video.c @@ -0,0 +1,12 @@ +Index: programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c +diff -u -p programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c +--- programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c.orig Tue Oct 4 01:46:14 2005 ++++ programs/Xserver/hw/xfree86/os-support/bsd/i386_video.c Thu Jan 26 14:57:56 2006 +@@ -35,6 +35,7 @@ + #include "xf86Priv.h" + + #include <errno.h> ++#include <sys/types.h> + #include <sys/mman.h> + + #ifdef HAS_MTRR_SUPPORT diff --git a/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c new file mode 100644 index 000000000000..d8f304d153f3 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c @@ -0,0 +1,13 @@ +Index: programs/Xserver/os/xprintf.c +diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c +--- programs/Xserver/os/xprintf.c.orig Sun Jul 3 17:53:52 2005 ++++ programs/Xserver/os/xprintf.c Thu Jan 26 12:47:37 2006 +@@ -39,7 +39,7 @@ + # ifdef __va_copy + # define va_copy __va_copy + # else +-# error "no working va_copy was found" ++# define va_copy(dest, src) ((dest) = (src)) + # endif + #endif + |