diff options
| author | Robert Noland <rnoland@FreeBSD.org> | 2009-03-02 19:29:23 +0000 |
|---|---|---|
| committer | Robert Noland <rnoland@FreeBSD.org> | 2009-03-02 19:29:23 +0000 |
| commit | 7841a19b632014c72f9db0c981b69a372e6d718c (patch) | |
| tree | 64c0f48b5c63ac6a58c187504b71e8d2fb911da0 /x11-servers | |
| parent | - Update to 1.6.3 (diff) | |
Add a patch to handle memory barriers on amd64 the same as linux.
This is reported to prevent some lockups with the nv driver on amd64.
http://bugs.freedesktop.org/show_bug.cgi?id=3168
Notes
Notes:
svn path=/head/; revision=229357
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 5558cd3c3726..7d336b57207d 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -8,7 +8,7 @@ PORTNAME= xorg-server PORTVERSION= 1.5.3 PORTEPOCH= 1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-servers MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ DISTFILES= xorg-server-${PORTVERSION}.tar.bz2 diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h new file mode 100644 index 000000000000..a4c50a07127a --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-compiler.h @@ -0,0 +1,11 @@ +--- hw/xfree86/common/compiler.h.orig 2009-03-02 12:21:23.000000000 -0600 ++++ hw/xfree86/common/compiler.h 2009-03-02 12:21:29.000000000 -0600 +@@ -498,7 +498,7 @@ + extern unsigned int inw(unsigned long port); + extern unsigned int inl(unsigned long port); + +-# elif defined(linux) && (defined(__amd64__) || defined(__x86_64__)) ++# elif defined(linux) || defined(__FreeBSD__) && (defined(__amd64__) || defined(__x86_64__)) + + # include <inttypes.h> + |