Hide AIGLX patches behind the "aiglx" USE flag, since the patches seem to

cause some EXA slowdowns (bug #147841, reported by Giacomo Perale).
Package-Manager: portage-2.1.2_pre2-r9

3 files changed, 36 insertions, 23 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index bde6a677e743..419cf447d040 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.175 2006/10/12 15:31:34 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.176 2006/10/13 22:54:58 joshuabaergen Exp $
+
+  13 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r1.ebuild:
+  Hide AIGLX patches behind the "aiglx" USE flag, since the patches seem to
+  cause some EXA slowdowns (bug #147841, reported by Giacomo Perale).
 
   12 Oct 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-server-1.1.1-r1.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index 72371ca0f35b..493ad1f33d16 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -125,18 +125,18 @@ EBUILD xorg-server-1.1.0-r1.ebuild 24569 RMD160 89333463053a1326e882153cc1aa5b9e
 MD5 6931e96ed29cdf066cf9bf399c751ad5 xorg-server-1.1.0-r1.ebuild 24569
 RMD160 89333463053a1326e882153cc1aa5b9e81b27eb0 xorg-server-1.1.0-r1.ebuild 24569
 SHA256 8eedd866ec4963ae94241d3ea90a8e80e2aa3f35a0f20fa793fde05e338bb995 xorg-server-1.1.0-r1.ebuild 24569
-EBUILD xorg-server-1.1.1-r1.ebuild 16375 RMD160 1beb9970f17811582532f5448cb303e8d8b39ff2 SHA1 5bf7fa65122eb65debc3c21152caad95fbce4cca SHA256 850efcf6442041601ce8704ea33c5d8a447ba21d056d800d3456caaa41a591fc
-MD5 db66d37395aae17a0f6303df7a815629 xorg-server-1.1.1-r1.ebuild 16375
-RMD160 1beb9970f17811582532f5448cb303e8d8b39ff2 xorg-server-1.1.1-r1.ebuild 16375
-SHA256 850efcf6442041601ce8704ea33c5d8a447ba21d056d800d3456caaa41a591fc xorg-server-1.1.1-r1.ebuild 16375
+EBUILD xorg-server-1.1.1-r1.ebuild 16649 RMD160 3f2a4939fc3df2ddaed659148c59cb8bba807a96 SHA1 0dfaa1cb17b9415774864f501d47e98da0eb94e0 SHA256 a4839315d10c3b509edec7ef4b7c580b610f14428ae2b159d6a8ea8a47d94c6c
+MD5 43a1b82ffbd0e9a12f8b7e2e7470efbd xorg-server-1.1.1-r1.ebuild 16649
+RMD160 3f2a4939fc3df2ddaed659148c59cb8bba807a96 xorg-server-1.1.1-r1.ebuild 16649
+SHA256 a4839315d10c3b509edec7ef4b7c580b610f14428ae2b159d6a8ea8a47d94c6c xorg-server-1.1.1-r1.ebuild 16649
 EBUILD xorg-server-1.1.1.ebuild 15382 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac SHA1 527956284fa7c6f68126db52adb3a25ac078d171 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb
 MD5 9a5fa768a77f72877ec3303f890f614e xorg-server-1.1.1.ebuild 15382
 RMD160 32ebd2bef1415d0193a42f7c9d80b07b36a653ac xorg-server-1.1.1.ebuild 15382
 SHA256 1608007b9b32c0ec110dffd2e65a7ac69200975b0f48fce27ba68a33c7a51dcb xorg-server-1.1.1.ebuild 15382
-MISC ChangeLog 36250 RMD160 abc67965247d4ddcc849393bd49b1cba201f5fdc SHA1 e4e95dc01c54f804547608ed68bef2396c85cb0a SHA256 c767b11c1538b8efe23a687dd090eec4ccca1d754f08064dd98c4152dbbd266a
-MD5 0a3b8d7a2d343a2f32cf0ce66e8298f9 ChangeLog 36250
-RMD160 abc67965247d4ddcc849393bd49b1cba201f5fdc ChangeLog 36250
-SHA256 c767b11c1538b8efe23a687dd090eec4ccca1d754f08064dd98c4152dbbd266a ChangeLog 36250
+MISC ChangeLog 36485 RMD160 1b7ca6e4df0c70d54626ba4d8bec715056cb6107 SHA1 f1e36e4edcca835d152d46c25b8248bf99057746 SHA256 88b5a1969cf204fb0d177e446a8b3ca3532f3ad490fcfe2127009f647a98d0db
+MD5 63527e0730880e69ecfcb01adcbd9ff2 ChangeLog 36485
+RMD160 1b7ca6e4df0c70d54626ba4d8bec715056cb6107 ChangeLog 36485
+SHA256 88b5a1969cf204fb0d177e446a8b3ca3532f3ad490fcfe2127009f647a98d0db ChangeLog 36485
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
index 9922b416e561..9b6f7c6bd23f 100644
--- a/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.10 2006/10/12 15:31:34 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r1.ebuild,v 1.11 2006/10/13 22:54:58 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -14,19 +14,6 @@ MESA_PV="6.5.1"
 MESA_P="${MESA_PN}-${MESA_PV}"
 MESA_SRC_P="${MESA_PN}Lib-${MESA_PV}"
 
-PATCHES="${FILESDIR}/01-no-move-damage.patch
-	${FILESDIR}/02-dont-backfill-bg-none.patch
-	${FILESDIR}/03-tfp-damage.patch
-	${FILESDIR}/04-mesa-copy-sub-buffer.patch
-	${FILESDIR}/05-offscreen-pixmaps.patch
-	${FILESDIR}/06-aiglx-happy-vt-switch.patch
-	${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
-	${FILESDIR}/${P}-install-libxf86config-headers.patch
-	${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
-	${FILESDIR}/${PV}-sparc64-ati-lockups.patch
-	${FILESDIR}/xorg-conf-example.patch"
-
-
 SRC_URI="${SRC_URI}
 	mirror://sourceforge/mesa3d/${MESA_SRC_P}.tar.bz2
 	http://xorg.freedesktop.org/releases/individual/xserver/${P}.tar.bz2"
@@ -120,6 +107,7 @@ IUSE="${IUSE_VIDEO_CARDS}
 	${IUSE_INPUT_DEVICES}
 	${IUSE_SERVERS}
 	3dfx
+	aiglx
 	dri ipv6 minimal nptl sdl xprint"
 RDEPEND="x11-libs/libXfont
 	x11-libs/xtrans
@@ -285,6 +273,26 @@ LICENSE="${LICENSE} MIT"
 pkg_setup() {
 	use minimal || ensure_a_server_is_building
 
+	PATCHES="${FILESDIR}/xorg-x11-server-1.1.1-mesa-6.5.1.patch
+		${FILESDIR}/${P}-install-libxf86config-headers.patch
+		${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
+		${FILESDIR}/${PV}-sparc64-ati-lockups.patch
+		${FILESDIR}/xorg-conf-example.patch"
+
+	# Patches required for compiz to work with AIGLX,
+	# but they slow EXA down (bug #147841).
+	if use aiglx; then
+		einfo "AIGLX patches will be applied."
+		ewarn "These patches are known to cause problems with EXA enabled."
+		PATCHES="${FILESDIR}/01-no-move-damage.patch
+			${FILESDIR}/02-dont-backfill-bg-none.patch
+			${FILESDIR}/03-tfp-damage.patch
+			${FILESDIR}/04-mesa-copy-sub-buffer.patch
+			${FILESDIR}/05-offscreen-pixmaps.patch
+			${FILESDIR}/06-aiglx-happy-vt-switch.patch
+			${PATCHES}"
+	fi
+
 	# SDL only available in kdrive build
 	if use kdrive && use sdl; then
 		conf_opts="${conf_opts} --enable-xsdl"