diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2014-05-29 19:32:08 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2014-05-29 19:32:08 +0000 |
| commit | eeabcd70248e684c12bf5ce627262c4dcfefc9fd (patch) | |
| tree | 61e86a48fc419a6aba9b078c954a99e5afd93e3d /x11-servers | |
| parent | 55e4a46b72c21c39a558a31bc9f4fad6f8484a89 (diff) | |
| download | ports-eeabcd70248e684c12bf5ce627262c4dcfefc9fd.tar.gz ports-eeabcd70248e684c12bf5ce627262c4dcfefc9fd.zip | |
Notes
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 6 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/extra-new-arch-powerpc | 27 |
2 files changed, 27 insertions, 6 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index d4273ec73284..9100d232e0a7 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -124,7 +124,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-i386 .if ${ARCH} == ia64 PLIST_SUB+= IA64_NA="@comment " -EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64 +EXTRA_PATCHES+= ${.CURDIR}/files/extra-arch-ia64 .else PLIST_SUB+= IA64_NA="" .endif @@ -132,9 +132,9 @@ PLIST_SUB+= IA64_NA="" .if ${ARCH} == powerpc || ${ARCH} == powerpc64 PLIST_SUB+= PPC_NA="@comment " .if defined(WITH_NEW_XORG) -EXTRA_PATCHES= ${.CURDIR}/files/extra-new-arch-powerpc +EXTRA_PATCHES+= ${.CURDIR}/files/extra-new-arch-powerpc .else -EXTRA_PATCHES= ${.CURDIR}/files/extra-old-arch-powerpc +EXTRA_PATCHES+= ${.CURDIR}/files/extra-old-arch-powerpc .endif .else PLIST_SUB+= PPC_NA="" diff --git a/x11-servers/xorg-server/files/extra-new-arch-powerpc b/x11-servers/xorg-server/files/extra-new-arch-powerpc index 894dfaeedb5e..74ccd91608ad 100644 --- a/x11-servers/xorg-server/files/extra-new-arch-powerpc +++ b/x11-servers/xorg-server/files/extra-new-arch-powerpc @@ -1,6 +1,27 @@ ---- hw/xfree86/os-support/bsd/ppc_video.c.orig 2012-05-17 19:09:03.000000000 +0200 -+++ hw/xfree86/os-support/bsd/ppc_video.c 2013-06-03 13:46:05.165578200 +0200 -@@ -135,7 +135,11 @@ +--- ./hw/xfree86/os-support/bsd/ppc_video.c.orig 2012-05-17 12:09:03.000000000 -0500 ++++ ./hw/xfree86/os-support/bsd/ppc_video.c 2014-01-18 14:36:42.000000000 -0600 +@@ -115,17 +115,19 @@ + Bool + xf86EnableIO() + { +- int fd = xf86Info.consoleFd; ++ int fd = open(DEV_MEM, O_RDWR); + + xf86MsgVerb(X_WARNING, 3, "xf86EnableIO %d\n", fd); + if (ioBase == MAP_FAILED) { + ioBase = mmap(NULL, 0x10000, PROT_READ | PROT_WRITE, MAP_SHARED, fd, + 0xf2000000); + xf86MsgVerb(X_INFO, 3, "xf86EnableIO: %08x\n", ioBase); ++#if 0 /* Non-fatal */ + if (ioBase == MAP_FAILED) { + xf86MsgVerb(X_WARNING, 3, "Can't map IO space!\n"); + return FALSE; + } ++#endif + } + return TRUE; + } +@@ -135,7 +137,11 @@ { if (ioBase != MAP_FAILED) { |