summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Guertin <gerk@gentoo.org>2003-02-28 04:57:39 +0000
committerMark Guertin <gerk@gentoo.org>2003-02-28 04:57:39 +0000
commit40948223463451a07bce24e98f9508ea93ba084e (patch)
treeee27725c5093740eabeb0814f8e913b385907169 /x11-base
parentmarked stable and added antialias switch (diff)
downloadgentoo-2-40948223463451a07bce24e98f9508ea93ba084e.tar.gz
gentoo-2-40948223463451a07bce24e98f9508ea93ba084e.tar.bz2
gentoo-2-40948223463451a07bce24e98f9508ea93ba084e.zip
fixed ppc patch for nv and 4.3.0
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xfree/ChangeLog5
-rw-r--r--x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch11
-rw-r--r--x11-base/xfree/xfree-4.3.0.ebuild4
3 files changed, 17 insertions, 3 deletions
diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 13507241f4b0..4bde5f822891 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,9 +1,12 @@
# ChangeLog for x11-base/xfree
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.102 2003/02/28 04:28:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.103 2003/02/28 04:57:39 gerk Exp $
*xfree-4.3.0 (27 Feb 2003)
+ 27 Feb 2003; Mark Guertin <gerk@gentoo.org> xfree-4.3.0.ebuild files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch :
+ updated nv patch for 4.3.0
+
27 Feb 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0.ebuild
files/digest-xfree-4.3.0 files/4.3.0 :
diff --git a/x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch b/x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch
new file mode 100644
index 000000000000..17104aac7e70
--- /dev/null
+++ b/x11-base/xfree/files/4.3.0-patches/XFree86-4.3.0-enable-nv-on-ppc.patch
@@ -0,0 +1,11 @@
+--- xc/config/cf/xfree86.cf.orig 2003-02-12 03:39:33.000000000 +0100
++++ xc/config/cf/xfree86.cf 2003-02-12 03:48:47.000000000 +0100
+@@ -888,7 +888,7 @@
+ /* Pure PCI drivers should go first */
+ # ifndef XF86CardDrivers
+ # define XF86CardDrivers ati mga glint s3 s3virge sis savage\
+- trident chips tdfx fbdev \
++ trident chips tdfx fbdev nv \
+ DevelDrivers vga \
+ XF86OSCardDrivers XF86ExtraCardDrivers
+ # endif
diff --git a/x11-base/xfree/xfree-4.3.0.ebuild b/x11-base/xfree/xfree-4.3.0.ebuild
index 6b6709089db5..30e10b7ff56e 100644
--- a/x11-base/xfree/xfree-4.3.0.ebuild
+++ b/x11-base/xfree/xfree-4.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0.ebuild,v 1.1 2003/02/28 04:28:29 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0.ebuild,v 1.2 2003/02/28 04:57:39 gerk Exp $
# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure
# that only we only strip stuff that are safe to strip ...
@@ -174,7 +174,7 @@ src_unpack() {
# enable the nv driver on ppc
if use ppc; then
- epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-enable-nv-on-ppc.patch || die
+ epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-enable-nv-on-ppc.patch
fi
# Fix HOME and END keys to work in xterm, bug #15254