summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-07-31 12:30:23 +0000
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>2010-07-31 12:30:23 +0000
commit04677ac32686b4914c3af7d8bd9243a12edd2eb1 (patch)
treea3f7ec9db568f9adf0eb110a733ae40456590534 /x11-base
parentVersion bump with important fixes, restrict tests since most of them are brok... (diff)
downloadhistorical-04677ac32686b4914c3af7d8bd9243a12edd2eb1.tar.gz
historical-04677ac32686b4914c3af7d8bd9243a12edd2eb1.tar.bz2
historical-04677ac32686b4914c3af7d8bd9243a12edd2eb1.zip
Add patch to prefer nouveau over nv to 1.7.7 too
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-server/ChangeLog6
-rw-r--r--x11-base/xorg-server/Manifest14
-rw-r--r--x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild3
3 files changed, 9 insertions, 14 deletions
diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index 1bbac1881c97..084c3da2947c 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-base/xorg-server
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.521 2010/07/31 11:40:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.522 2010/07/31 12:30:23 chithanh Exp $
+
+ 31 Jul 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+ xorg-server-1.7.7-r1.ebuild:
+ Add patch to prefer nouveau over nv to 1.7.7 too
*xorg-server-1.7.7-r1 (31 Jul 2010)
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index e28a39db31a4..25931c0358b7 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 1.7.3.901-0001-dix-if-owner-events-is-true-for-passive-grabs-add-th.patch 3142 RMD160 3cd195de58afa6f64df332c80334bdcbd5627706 SHA1 8b226f32183eabf130e85ad07d1bbffaa2a14915 SHA256 c315ee87fb09265b6372503c628192f527064e9493fdd3c66801f26ab974df6a
AUX 1.7.5.902-fix-tslib-1.0-check.patch 743 RMD160 139969e7c89ccbb6c86a93b7ea74aad2e942cd55 SHA1 621f3dea75aeb84a30279e5854b0ae256f653113 SHA256 03fced212933eb4502554c4fd629ead92027dc13f178ad5c43cd59b7ce615cea
AUX xdm-setup.initd-1 346 RMD160 e68512e71adbf15743f789bb6b5587b07a9812a3 SHA1 f25303b8bcef0c5d2eb61517d5347b4b88736cd4 SHA256 942ce5e8d1a0770543b683dcc388bae7619a24eb9741c1cd678ed3df97c01406
@@ -16,14 +13,7 @@ DIST xorg-server-1.7.7.tar.bz2 4939257 RMD160 19ab82795abe122cd267e4718152bf87af
DIST xorg-server-1.8.2.tar.bz2 5226285 RMD160 dee713fe677fdcccc0fec29a02b0af4ef48819f2 SHA1 825d11757b729444800e0a3afd4e98d19d286b1a SHA256 52157e12295cfb6f1553d3ce64af2b27ee5b512958d4c66d21065d2376aeace2
EBUILD xorg-server-1.6.5-r1.ebuild 6842 RMD160 7dc826b80d62c7bad6bc36dbcd9d5134ac8def0e SHA1 fca33f2816607703c3ed2612be1238f9cd6f28da SHA256 71441f59df32e25dad5deae4838e312e62a87497e0e4362cd297e27f33b96584
EBUILD xorg-server-1.7.6.ebuild 7309 RMD160 b761bc151ecdc960d3e881e059ce5bafdccc3d32 SHA1 31c1c8915970323e6786eb8a0f5945553d1a9f22 SHA256 c8640d0acde2da02116a589712159b14414840a76e36b7ff555edb7c688f455a
-EBUILD xorg-server-1.7.7-r1.ebuild 7244 RMD160 bcb0462f505a9b49acca236d0269ac255c63b614 SHA1 d5283bf1bc06a35b43fbc3ec97fdfaf37dddb91b SHA256 080ecc2973481e254e930da02c59db6cf1e871fc9275a0083bc60adac5bf9034
+EBUILD xorg-server-1.7.7-r1.ebuild 7290 RMD160 294da03d6fa65167fd4bd06dc2cda47085ccb8d0 SHA1 c553f4be63de884328d88d3827e85551ffc933dd SHA256 df6401ab22f9f0a4850c9e6cbb6b7c3f7618db4faab8faf169700164ec2f3aff
EBUILD xorg-server-1.8.2.ebuild 8080 RMD160 353d87f4a9ec420430dc96eec68374da582f1164 SHA1 276e307b30d3d8cb7b1908b82768a57fe9b4c4ea SHA256 aa5cf0497aeec9b178954aaab8d8c9bc0e8790070c4d3d1dd23b49afc4bc3ebf
-MISC ChangeLog 115988 RMD160 3377a05c75e17d5fe49d6058528d72369260d35c SHA1 d2ad7da8b113edb1f4faf9e6c2057b523e691ed1 SHA256 5e89f63a260e2b07b6926d711fbe0e2c82b203a1815b022d3a1c7c8a88dae6ff
+MISC ChangeLog 116139 RMD160 2864ba2936a85aaac0c27679a155494910d57a8b SHA1 b41f90fff264fa807caea6b969bc2ac08b8fee86 SHA256 7d3f886db6e4447d0a991bdec6fefbbfea4e3b1e5a1c6ac5631b20d289f0d3f2
MISC metadata.xml 499 RMD160 13985f2e8ee45fa43d4689f4c09ae4d3c8fe7e59 SHA1 b84c2d3e23c3eae539fa1c37aa0e0345083bedea SHA256 f2f68c9cdaf48810cc035fb5b3bb3467569be2aabbe5eb74405b75427d5193ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkxUC5IACgkQHB6c3gNBRYdaNgCfaFM949PluCeGkleZlCsXjQrm
-OpMAoIvEg3Cp7SkbbidvNRNcVMcNV1dy
-=W96c
------END PGP SIGNATURE-----
diff --git a/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild
index 479215384a0c..c0bab79b6e92 100644
--- a/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.7.7-r1.ebuild,v 1.1 2010/07/31 11:40:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-1.7.7-r1.ebuild,v 1.2 2010/07/31 12:30:23 chithanh Exp $
EAPI="2"
@@ -126,6 +126,7 @@ UPSTREAMED_PATCHES=(
"${WORKDIR}/patches/"
# Fix for bug #304067
"${FILESDIR}/1.7.5.902-fix-tslib-1.0-check.patch"
+ "${FILESDIR}"/${PN}-1.8-nouveau-default.patch
)
PATCHES=(