- Move ports/branches/xorg-dev to ports/trunk/

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@388 058c260c-8361-11dd-a0ac-aa2bafec7d09

9 files changed, 328 insertions, 0 deletions

diff --git a/x11-servers/xorg-server/files/extra-arch-ia64 b/x11-servers/xorg-server/files/extra-arch-ia64
new file mode 100644
index 0000000..9a3f48e
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-arch-ia64
@@ -0,0 +1,221 @@
+--- configure.dist	2009-06-18 17:05:59.000000000 -0700
++++ configure	2009-06-18 17:08:47.000000000 -0700
+@@ -1097,6 +1097,8 @@
+ SPARC64_VIDEO_TRUE
+ PPC_VIDEO_FALSE
+ PPC_VIDEO_TRUE
++IA64_VIDEO_FALSE
++IA64_VIDEO_TRUE
+ I386_VIDEO_FALSE
+ I386_VIDEO_TRUE
+ ARM_VIDEO_FALSE
+@@ -19134,6 +19136,7 @@
+ 	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+ 	;;
+   ia64*)
++	IA64_VIDEO=yes
+   	GLX_ARCH_DEFINES="-D__GLX_ALIGN64"
+ 	;;
+   s390*)
+@@ -19166,6 +19169,14 @@
+   I386_VIDEO_FALSE=
+ fi
+ 
++ if test "x$IA64_VIDEO" = xyes; then
++  IA64_VIDEO_TRUE=
++  IA64_VIDEO_FALSE='#'
++else
++  IA64_VIDEO_TRUE='#'
++  IA64_VIDEO_FALSE=
++fi
++
+  if test "x$PPC_VIDEO" = xyes; then
+   PPC_VIDEO_TRUE=
+   PPC_VIDEO_FALSE='#'
+--- hw/xfree86/common/compiler.h.orig	2011-06-11 18:55:47.000000000 +0200
++++ hw/xfree86/common/compiler.h	2011-07-21 20:34:44.000000000 +0200
+@@ -397,12 +397,10 @@
+ #include <machine/pio.h>
+ #endif /* __NetBSD__ */
+ 
+-#   elif defined(linux) && defined(__ia64__) 
++#   elif (defined(linux) || defined(__FreeBSD__)) && defined(__ia64__) 
+  
+ #    include <inttypes.h>
+ 
+-#    include <sys/io.h>
+-
+ #    undef outb
+ #    undef outw
+ #    undef outl
+--- hw/xfree86/os-support/bsd/Makefile.in.dist	2009-06-18 17:45:13.000000000 -0700
++++ hw/xfree86/os-support/bsd/Makefile.in	2009-06-18 17:45:19.000000000 -0700
+@@ -63,6 +63,7 @@
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@	ioperm_noop.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_TRUE@am__objects_1 = ppc_video.lo
++@IA64_VIDEO_TRUE@am__objects_1 = ia64_video.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@I386_VIDEO_TRUE@am__objects_1 = i386_video.lo
+ @ALPHA_VIDEO_FALSE@@ARM_VIDEO_TRUE@am__objects_1 = arm_video.lo
+ @ALPHA_VIDEO_TRUE@am__objects_1 = alpha_video.lo bsd_ev56.lo \
+@@ -393,6 +394,7 @@
+ 
+ @ARM_VIDEO_TRUE@ARCH_SOURCES = arm_video.c
+ @I386_VIDEO_TRUE@ARCH_SOURCES = i386_video.c
++@IA64_VIDEO_TRUE@ARCH_SOURCES = ia64_video.c
+ @PPC_VIDEO_TRUE@ARCH_SOURCES = ppc_video.c
+ 
+ # Cheat here and piggyback other sparc64 bits on SPARC64_VIDEO.
+--- /dev/null	2009-06-18 18:27:23.000000000 -0700
++++ hw/xfree86/os-support/bsd/ia64_video.c	2009-06-18 18:26:02.000000000 -0700
+@@ -0,0 +1,150 @@
++#ifdef HAVE_XORG_CONFIG_H
++#include <xorg-config.h>
++#endif
++
++#include <X11/X.h>
++#include "xf86.h"
++#include "xf86Priv.h"
++
++#include "xf86_OSlib.h"
++#include "xf86OSpriv.h"
++
++#include "bus/Pci.h"
++
++#ifndef MAP_FAILED
++#define MAP_FAILED ((caddr_t)-1)
++#endif
++
++
++/***************************************************************************/
++/* Video Memory Mapping section                                            */
++/***************************************************************************/
++
++#define DEV_MEM "/dev/mem"
++
++static pointer ia64MapVidMem(int, unsigned long, unsigned long, int flags);
++static void ia64UnmapVidMem(int, pointer, unsigned long);
++
++Bool xf86EnableIO(void);
++void xf86DisableIO(void);
++
++void
++xf86OSInitVidMem(VidMemInfoPtr pVidMem)
++{
++	pVidMem->linearSupported = TRUE;
++	pVidMem->mapMem = ia64MapVidMem;
++	pVidMem->unmapMem = ia64UnmapVidMem;
++	pVidMem->initialised = TRUE;
++	xf86EnableIO();
++}
++
++
++_X_EXPORT volatile unsigned char *ioBase = MAP_FAILED;
++
++static pointer
++ia64MapVidMem(int ScreenNum, unsigned long Base, unsigned long Size, int flags)
++{
++	int fd = xf86Info.screenFd;
++	pointer base;
++#ifdef DEBUG
++	xf86MsgVerb(X_INFO, 3, "mapVidMem %lx, %lx, fd = %d", 
++		    Base, Size, fd);
++#endif
++
++	base = mmap(0, Size,
++		    (flags & VIDMEM_READONLY) ?
++		     PROT_READ : (PROT_READ | PROT_WRITE),
++		    MAP_SHARED, fd, Base);
++	if (base == MAP_FAILED)
++		FatalError("%s: could not mmap screen [s=%lx,a=%lx] (%s)",
++			   "xf86MapVidMem", Size, Base, strerror(errno));
++
++	return base;
++}
++
++static void
++ia64UnmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
++{
++	munmap(Base, Size);
++}
++
++_X_EXPORT int
++xf86ReadBIOS(unsigned long Base, unsigned long Offset, unsigned char *Buf,
++	     int Len)
++{
++	int rv;
++	static int kmem = -1;
++
++	if (kmem == -1) {
++		kmem = open(DEV_MEM, 2);
++		if (kmem == -1) {
++			FatalError("xf86ReadBIOS: open %s", DEV_MEM);
++		}
++	}
++
++#ifdef DEBUG
++	xf86MsgVerb(X_INFO, 3, "xf86ReadBIOS() %lx %lx, %x\n", 
++		    Base, Offset, Len);
++#endif
++
++
++	lseek(kmem, Base + Offset, 0);
++	rv = read(kmem, Buf, Len);
++
++	return rv;
++}
++
++Bool xf86EnableIO()
++{
++        int fd = xf86Info.screenFd;
++
++        xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd);
++        if (ioBase == MAP_FAILED)
++        {
++                ioBase=mmap(NULL, 0x10000, PROT_READ|PROT_WRITE, MAP_SHARED, fd,
++                    0);
++                xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %p\n", ioBase);
++                if (ioBase == MAP_FAILED) {
++                        xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n");
++			return FALSE;
++		}
++        }
++	return TRUE;
++}
++
++void xf86DisableIO()
++{
++
++        if (ioBase != MAP_FAILED)
++        {
++                munmap((void *)(uintptr_t)(void *)ioBase, 0x10000);
++                ioBase = MAP_FAILED;
++        }
++}
++
++void outb(unsigned long port, unsigned char val)
++{
++}
++
++void outw(unsigned long port, unsigned short val)
++{
++}
++
++void outl(unsigned long port, unsigned int val)
++{
++}
++
++unsigned int inb(unsigned long port)
++{
++	return 0xff;
++}
++
++unsigned int inw(unsigned long port)
++{
++	return 0xffff;
++}
++
++unsigned int inl(unsigned long port)
++{
++	return 0xffffffff;
++}
diff --git a/x11-servers/xorg-server/files/extra-arch-powerpc b/x11-servers/xorg-server/files/extra-arch-powerpc
new file mode 100644
index 0000000..6fa9178
--- /dev/null
+++ b/x11-servers/xorg-server/files/extra-arch-powerpc
@@ -0,0 +1,14 @@
+--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2008-01-02 12:29:21.000000000 +0000
++++ hw/xfree86/os-support/bsd/ppc_video.c	2008-01-02 12:29:00.000000000 +0000
+@@ -164,7 +164,11 @@
+ 
+         if (ioBase != MAP_FAILED)
+         {
++#if defined(__FreeBSD__)
++		munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
++#else
+                 munmap(__UNVOLATILE(ioBase), 0x10000);
++#endif
+                 ioBase = MAP_FAILED;
+         }
+ }
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 0000000..59aad37
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
@@ -0,0 +1,11 @@
+--- hw/xfree86/common/xf86Config.c.orig	Fri Jun 23 12:32:32 2006
++++ hw/xfree86/common/xf86Config.c	Fri Jun 23 12:32:46 2006
+@@ -1042,7 +1042,7 @@
+     else
+ 	xf86Info.estimateSizesAggressively = 0;
+ 
+-    xf86Info.aiglx = TRUE;
++    xf86Info.aiglx = FALSE;
+     xf86Info.aiglxFrom = X_DEFAULT;
+     if (xf86GetOptValBool(FlagOptions, FLAG_AIGLX, &value)) {
+ 	xf86Info.aiglx = value;
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 0000000..933742b
--- /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
+--- hw/xfree86/os-support/bsd/i386_video.c.orig	Tue Oct  4 01:46:14 2005
++++ 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-hw-xfree86-os-support-bsd-sparc64_video.c b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
new file mode 100644
index 0000000..651be80
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c
@@ -0,0 +1,13 @@
+--- hw/xfree86/os-support/bsd/sparc64_video.c.orig	2008-10-02 21:01:25.000000000 +0000
++++ hw/xfree86/os-support/bsd/sparc64_video.c	2009-03-29 19:55:40.000000000 +0000
+@@ -52,6 +52,10 @@
+ 	pVidMem->mapMem = sparc64MapVidMem;
+ 	pVidMem->unmapMem = sparc64UnmapVidMem;
+ 	pVidMem->initialised = TRUE;
++
++#if defined(__FreeBSD__)
++	pci_system_init_dev_mem(xf86Info.screenFd);
++#endif
+ }
+ 
+ static pointer
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 0000000..e9fb876
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-Xserver-os-xprintf.c
@@ -0,0 +1,12 @@
+diff -u -p programs/Xserver/os/xprintf.c.orig programs/Xserver/os/xprintf.c
+--- os/xprintf.c.orig	Sun Jul  3 17:53:52 2005
++++ 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
+     
diff --git a/x11-servers/xorg-server/files/patch-os-utils.c b/x11-servers/xorg-server/files/patch-os-utils.c
new file mode 100644
index 0000000..2980ded
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-os-utils.c
@@ -0,0 +1,20 @@
+--- os/utils.c.orig	2010-05-04 02:48:00.000000000 +0200
++++ os/utils.c	2011-10-18 20:08:10.000000000 +0200
+@@ -315,7 +315,7 @@
+     FatalError("Could not create lock file in %s\n", tmp);
+   (void) sprintf(pid_str, "%10ld\n", (long)getpid());
+   (void) write(lfd, pid_str, 11);
+-  (void) chmod(tmp, 0444);
++  (void) fchmod(tmp, 0444);
+   (void) close(lfd);
+ 
+   /*
+@@ -336,7 +336,7 @@
+       /*
+        * Read the pid from the existing file
+        */
+-      lfd = open(LockFile, O_RDONLY);
++      lfd = open(LockFile, O_RDONLY|O_NOFOLLOW);
+       if (lfd < 0) {
+         unlink(tmp);
+         FatalError("Can't read lock file %s\n", LockFile); 
diff --git a/x11-servers/xorg-server/files/patch-servermd.h b/x11-servers/xorg-server/files/patch-servermd.h
new file mode 100644
index 0000000..5bbb1e4
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-servermd.h
@@ -0,0 +1,11 @@
+--- include/servermd.h.orig	Sun Jan  8 14:05:55 2006
++++ include/servermd.h	Sun Jan  8 14:06:22 2006
+@@ -216,7 +216,7 @@
+     defined(__sparc__) || defined(__mc68000__)
+ 
+ #if defined(__sparc) || defined(__sparc__)
+-# if !defined(sparc)
++# if !defined(sparc) && !defined(__FreeBSD__)
+ #  define sparc 1
+ # endif
+ #endif
diff --git a/x11-servers/xorg-server/files/patch-xorgconf.cpp b/x11-servers/xorg-server/files/patch-xorgconf.cpp
new file mode 100644
index 0000000..04e217b
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xorgconf.cpp
@@ -0,0 +1,14 @@
+--- hw/xfree86/xorgconf.cpp.orig	Fri Dec 31 14:40:27 2004
++++ hw/xfree86/xorgconf.cpp	Fri Dec 31 14:40:28 2004
+@@ -624,3 +624,11 @@
+     InputDevice "Keyboard1" "CoreKeyboard"
+ EndSection
+ 
++ 
++XCOMM  Two experimental extensions are available -- Composite and XEVIE.  Uncomment
++XCOMM  the section below to enable Composite.  Many extensions can also be disabled
++XCOMM  in this manner.
++
++XCOMM Section "Extensions"
++XCOMM 	Option "Composite" "Enable"
++XCOMM EndSection