svn commit: r321899 - in head/x11-servers/xorg-server: . files

[Niclas Zeising]

Author: zeising
Date: Thu Jun 27 18:38:27 2013
New Revision: 321899
URL: http://svnweb.freebsd.org/changeset/ports/321899

Log:
  Enable AIGLX by default on xorg-server 1.12. (WITH_NEW_XORG)
  Bump portrevision for 1.12
  
  Obtained from:	xorg development repo

Added:
  head/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c
     - copied unchanged from r321791, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
Deleted:
  head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c
Modified:
  head/x11-servers/xorg-server/Makefile

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Thu Jun 27 18:31:06 2013	(r321898)
+++ head/x11-servers/xorg-server/Makefile	Thu Jun 27 18:38:27 2013	(r321899)
@@ -22,7 +22,7 @@ SLAVE_PORT?=	no
 
 .if defined(WITH_NEW_XORG)
 XORG_VERSION=	1.12.4
-XORG_REVISION=	0
+XORG_REVISION=	1
 PLIST_SUB+=	OLD="@comment " NEW=""
 EXTRA_PATCHES+=	${FILESDIR}/extra-clang
 .else
@@ -35,7 +35,8 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-Xext-x
 		${FILESDIR}/extra-include_eventstr.h \
 		${FILESDIR}/extra-os-utils.c \
 		${FILESDIR}/extra-servermd.h \
-		${FILESDIR}/extra-dix_events.c
+		${FILESDIR}/extra-dix_events.c \
+		${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c
 .endif
 
 USE_BZIP2=	yes

Copied: head/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c (from r321791, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-common-xf86Config.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-common-xf86Config.c	Thu Jun 27 18:38:27 2013	(r321899, copy of r321791, head/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;