Only apply the GLX endianness fix if AIGLX is enabled, since it fixes one of

the AIGLX patches.  Thanks to Elisamuel Resto and Mike Auty for figuring out
what the problem was.  Closes bug #157401.
Package-Manager: portage-2.1.2_rc2-r5

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index dac1b5bf1edb1fcd11c1c08c67b70231be799235..47fa160ec15b9ad6cc557ad7ff34efb0ffc07560 100644 (file)
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.204 2006/12/07 03:45:32 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.205 2006/12/07 16:49:11 joshuabaergen Exp $
+
+  07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xorg-server-1.1.1-r3.ebuild:
+  Only apply the GLX endianness fix if AIGLX is enabled, since it fixes one of
+  the AIGLX patches.  Thanks to Elisamuel Resto and Mike Auty for figuring out
+  what the problem was.  Closes bug #157401.
 
   07 Dec 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xorg-server-1.2.99.0.ebuild:

diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index d4e005c47038b5ea150d612e9e52554c9656a739..d4282b5d9c47806b700a23c3986f775706704a0f 100644 (file)
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -156,10 +156,10 @@ EBUILD xorg-server-1.1.1-r2.ebuild 17267 RMD160 3067b3ef7cdfa3ae7112e3c0e190962e
 MD5 72ab4ec77f0904adb8b89baa810bb068 xorg-server-1.1.1-r2.ebuild 17267
 RMD160 3067b3ef7cdfa3ae7112e3c0e190962e2b613386 xorg-server-1.1.1-r2.ebuild 17267
 SHA256 81441719c2581da75d02e4b12a91d9eb9d1e4cb4e51c028f6708b01d92b9144c xorg-server-1.1.1-r2.ebuild 17267
-EBUILD xorg-server-1.1.1-r3.ebuild 17312 RMD160 63ff7cc25eac6139a941cb849a576bd4e054d5e1 SHA1 1cfb267e186097e9528a7eff57d263358b76e87a SHA256 19fd49ccbf37920c0f71217f565508ae9ffd2e8ffa26109479c8be73579de8b5
-MD5 e6345e52c2c3d6fbb081da25a12229cf xorg-server-1.1.1-r3.ebuild 17312
-RMD160 63ff7cc25eac6139a941cb849a576bd4e054d5e1 xorg-server-1.1.1-r3.ebuild 17312
-SHA256 19fd49ccbf37920c0f71217f565508ae9ffd2e8ffa26109479c8be73579de8b5 xorg-server-1.1.1-r3.ebuild 17312
+EBUILD xorg-server-1.1.1-r3.ebuild 17313 RMD160 72d71c3354cf5dbe311f9b0fd141e1315764dce6 SHA1 1e69cb292e21eecd60df57f55ae7acd7aba40c60 SHA256 4315cbac1783b2770ff3e3a17fb99a6feae347f4ea17e74e24d8b8ddf1fae6a8
+MD5 845f1194f18874f9ac22d3049ac08823 xorg-server-1.1.1-r3.ebuild 17313
+RMD160 72d71c3354cf5dbe311f9b0fd141e1315764dce6 xorg-server-1.1.1-r3.ebuild 17313
+SHA256 4315cbac1783b2770ff3e3a17fb99a6feae347f4ea17e74e24d8b8ddf1fae6a8 xorg-server-1.1.1-r3.ebuild 17313
 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
@@ -172,10 +172,10 @@ EBUILD xorg-server-1.2.99.0.ebuild 16872 RMD160 f6237988fdbc865a570501dac3cbebe6
 MD5 cf7a1a9de26daa4e10c2e898537fac3a xorg-server-1.2.99.0.ebuild 16872
 RMD160 f6237988fdbc865a570501dac3cbebe64d169c61 xorg-server-1.2.99.0.ebuild 16872
 SHA256 d216d96349bb34943c7f92fda6cb1d636fb6a5f912a051a08a74c18be99ab08d xorg-server-1.2.99.0.ebuild 16872
-MISC ChangeLog 42351 RMD160 f5d123f865106071df7ce49ebe502f4eea4f6299 SHA1 863b066c4080e2413080fbd2e622e9f30024b62f SHA256 79c692be50a27c8d9363c7c6fb004fe09029032660965f29dae1ca0263fa669b
-MD5 9a20354057aec7d7dfbd4108d61f4551 ChangeLog 42351
-RMD160 f5d123f865106071df7ce49ebe502f4eea4f6299 ChangeLog 42351
-SHA256 79c692be50a27c8d9363c7c6fb004fe09029032660965f29dae1ca0263fa669b ChangeLog 42351
+MISC ChangeLog 42643 RMD160 0a45f6c85d03e474a06f7b1174928ca86323639f SHA1 c2be09ddb4dc7a83257a5649266740eef4ff1b10 SHA256 add5daac5ee8529afbae63d0ad459c5f7e6b7d6b4ce3fb81e659638bd3eb42dc
+MD5 9d3a637556b927f9668285105ca523eb ChangeLog 42643
+RMD160 0a45f6c85d03e474a06f7b1174928ca86323639f ChangeLog 42643
+SHA256 add5daac5ee8529afbae63d0ad459c5f7e6b7d6b4ce3fb81e659638bd3eb42dc ChangeLog 42643
 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-r3.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild
index 516f3fff6ff5916b4753a85605a1104ce4051a12..1729847b145627f4730fa45a28cc9f2dd2dadc4f 100644 (file)
--- a/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.1.1-r3.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-r3.ebuild,v 1.1 2006/12/07 03:38:13 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild,v 1.2 2006/12/07 16:49:11 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
@@ -278,8 +278,7 @@ pkg_setup() {
                ${FILESDIR}/${PV}-fix-xrandr-zoom-keys.patch
                ${FILESDIR}/${PV}-sparc64-ati-lockups.patch
                ${FILESDIR}/xorg-conf-example.patch
-               ${FILESDIR}/${PV}-fix_acpi_tokenize.patch
-               ${FILESDIR}/${PV}-fix_big_endian_glx.patch"
+               ${FILESDIR}/${PV}-fix_acpi_tokenize.patch"
 
        # Patches required for compiz to work with AIGLX,
        # but they slow EXA down (bug #147841).
@@ -292,6 +291,7 @@ pkg_setup() {
                        ${FILESDIR}/04-mesa-copy-sub-buffer.patch
                        ${FILESDIR}/05-offscreen-pixmaps.patch
                        ${FILESDIR}/06-aiglx-happy-vt-switch.patch
+                       ${FILESDIR}/${PV}-fix_big_endian_glx.patch
                        ${PATCHES}"
        fi