aboutsummaryrefslogtreecommitdiffstats
path: root/x11-servers/xorg-server
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2009-04-01 04:19:04 +0800
committermarius <marius@FreeBSD.org>2009-04-01 04:19:04 +0800
commit7f616126dc0f51e0984b6aa3eb2788593c5c9104 (patch)
tree28faaccb88afa504f0c6e61181418403d500bbbb /x11-servers/xorg-server
parent2fab436526704429523ec6dcc6aff1b0282af50a (diff)
downloadfreebsd-ports-gnome-7f616126dc0f51e0984b6aa3eb2788593c5c9104.tar.gz
freebsd-ports-gnome-7f616126dc0f51e0984b6aa3eb2788593c5c9104.tar.zst
freebsd-ports-gnome-7f616126dc0f51e0984b6aa3eb2788593c5c9104.zip
Given that the x86-centric approach of mmap(2)'ing PCI memory via
mem(4) doesn't work on sparc64, revert to the pre-libpciaccess approach of using the tty(4) device opened by the X server there. Hopefully we have proper MI means of doing so one day. Approved by: flz
Diffstat (limited to 'x11-servers/xorg-server')
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c13
2 files changed, 14 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index c4d9b78f5108..9b3b390d0d9a 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xorg-server
PORTVERSION= 1.5.3
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= x11-servers
MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/
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 000000000000..651be80114fe
--- /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