diff options
| author |   Joshua Baergen <joshuabaergen@gentoo.org> | 2006-12-07 16:49:11 +0000 |
|---|---|---|
| committer | Joshua Baergen <joshuabaergen@gentoo.org> | 2006-12-07 16:49:11 +0000 |
| commit | 2f1bd562383868ffc96fb98d54db0271636ba00a (patch) | |
| tree | e595a3133b186c71cf50fb339659192450cd5282 /x11-base | |
| parent | prune old versions (diff) | |
| download | gentoo-2-2f1bd562383868ffc96fb98d54db0271636ba00a.tar.gz gentoo-2-2f1bd562383868ffc96fb98d54db0271636ba00a.tar.bz2 gentoo-2-2f1bd562383868ffc96fb98d54db0271636ba00a.zip | |
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.
(Portage version: 2.1.2_rc2-r5)
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xorg-server/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild | 6 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index dac1b5bf1edb..47fa160ec15b 100644 --- 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/xorg-server-1.1.1-r3.ebuild b/x11-base/xorg-server/xorg-server-1.1.1-r3.ebuild index 516f3fff6ff5..1729847b1456 100644 --- 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 |