The FreeBSD x11 team proudly presents

an zeising, kwm, miwi, bapt, eadler production:

Xorg 7.7

Starring:
xserver 1.12.4 (new xorg only)
Mesa 8.0.4, including libGL, libGLU and dri (new xorg only)
libX11 1.5.0
libxcb 1.9
libdrm 2.4.42 (new xorg only)
freeglut 2.8.1
Also starring:
Updates to drivers and other libraries and utilities

Additional notes:
Change pkgconf to be a build dependency.
Add a new USE_XORG, xcb, to depend on libxcb and update all ports to use
this.
Trim makefile headers.
Take maintanership of x11/xcb-proto, ok'd by ashish.
If you are running WITH_NEW_XORG=, you need to rebuild all installed
drivers, see UPDATING for more information.
Various fixes to make ports compile.

PR:		ports/177942
Exp-run by:	miwi
Approved by:	portmgr (miwi)

Thanks to all who helped testing!

1 files changed, 5 insertions, 7 deletions

diff --git a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
index 84a992a3bfd9..73d311a98c82 100644
--- a/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
+++ b/x11-drivers/xf86-video-ati/files/patch-src_radeon_accel.c
@@ -1,17 +1,15 @@
---- src/radeon_accel.c.orig	2012-04-15 19:36:08.000000000 +0200
-+++ src/radeon_accel.c	2012-04-15 19:36:15.000000000 +0200
-@@ -982,10 +982,9 @@
+--- src/radeon_accel.c.orig	2012-06-25 10:19:41.000000000 +0200
++++ src/radeon_accel.c	2012-07-30 02:11:51.000000000 +0200
+@@ -967,10 +967,9 @@
  
  	    for (; nwords > 0; --nwords, ++d, ++s)
  #ifdef __powerpc__
 -		asm volatile("stwbrx %0,0,%1" : : "r" (*s), "r" (d));
 +		asm volatile("sthbrx %0,0,%1" : : "r" (*s), "r" (d));
  #else
--	        *d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
+-		*d = ((*s >> 24) & 0xff) | ((*s >> 8) & 0xff00)
 -			| ((*s & 0xff00) << 8) | ((*s & 0xff) << 24);
 +		*d = (*s >> 8) | (*s << 8);
  #endif
  	    return;
- 	}
-
-
+         }