From e58e4c86e66db0cc56d430fa993e380798701ec2 Mon Sep 17 00:00:00 2001 From: Seemant Kulleen Date: Tue, 25 Feb 2003 00:52:22 +0000 Subject: small fix0rs --- x11-base/xfree/ChangeLog | 6 ++++-- .../XFree86-4.2.99.902-enable-nv-on-ppc.patch | 11 +++++++++++ x11-base/xfree/files/digest-xfree-4.2.99.902 | 2 +- x11-base/xfree/xfree-4.2.99.902.ebuild | 6 +++--- 4 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 x11-base/xfree/files/4.2.99.902-patches/XFree86-4.2.99.902-enable-nv-on-ppc.patch (limited to 'x11-base') diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog index 3c18c6122016..a3feb2b3d815 100644 --- a/x11-base/xfree/ChangeLog +++ b/x11-base/xfree/ChangeLog @@ -1,10 +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.100 2003/02/25 00:43:02 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.101 2003/02/25 00:52:22 seemant Exp $ *xfree-4.2.99.902 (24 Feb 2003) - 24 Feb 2003; Seemant Kulleen xfree-4.2.99.902.ebuild files/digest-xfree-4.2.99.902 files/4.2.99.902/10xfree files/4.2.99.902/XftConfig files/4.2.99.902/Xsession files/4.2.99.902/Xsetup_0 files/4.2.99.902/chooser.sh files/4.2.99.902/site.def files/4.2.99.902/startDM.sh files/4.2.99.902/xdm.pamd files/4.2.99.902/xdm.start files/4.2.99.902/xfs.conf.d files/4.2.99.902/xfs.config files/4.2.99.902/xfs.start files/4.2.99.902/xinitrc files/4.2.99.902/xserver.pamd files/4.2.99.902/Sessions/Xsession files/4.2.99.902/lib/libGL.la files/4.2.99.902/lib/libGLU.la files/4.2.99.902/lib/libOSMesa.la files/4.2.99.902-patches/XFree86-4.2.0-agpgart-load.patch.bz2 files/4.2.99.902-patches/XFree86-4.2.0-fixkbd.patch.bz2 files/4.2.99.902-patches/XFree86-4.2.0-i18n.patch.bz2 files/4.2.99.902-patches/XFree86-4.2.99.4-no-optimize.patch.bz2 : + 24 Feb 2003; Seemant Kulleen xfree-4.2.99.902.ebuild + files/digest-xfree-4.2.99.902 : + Version bump to release candidate 3 for X-4.3 23 Feb 2003; Martin Schlemmer xfree-4.2.1-r2.ebuild : diff --git a/x11-base/xfree/files/4.2.99.902-patches/XFree86-4.2.99.902-enable-nv-on-ppc.patch b/x11-base/xfree/files/4.2.99.902-patches/XFree86-4.2.99.902-enable-nv-on-ppc.patch new file mode 100644 index 000000000000..17104aac7e70 --- /dev/null +++ b/x11-base/xfree/files/4.2.99.902-patches/XFree86-4.2.99.902-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/files/digest-xfree-4.2.99.902 b/x11-base/xfree/files/digest-xfree-4.2.99.902 index c5046f580bff..881b909d040d 100644 --- a/x11-base/xfree/files/digest-xfree-4.2.99.902 +++ b/x11-base/xfree/files/digest-xfree-4.2.99.902 @@ -2,7 +2,7 @@ MD5 0a2998b513ab60d8de2585cb1b78d3f3 X4.2.99.902-1.tar.bz2 16551259 MD5 5e350827a54481a58faec49f1a62c96b X4.2.99.902-2.tar.bz2 8261696 MD5 af7e09e6e0b9c857942ed417eb530a5b X4.2.99.902-3.tar.bz2 13003534 MD5 242ea02c3f854cb33e319afa4d43fd46 X4.2.99.902-4.tar.bz2 16671278 -MD5 4ecbe985e304445695dc82af0a532988 XFree86-4.2.99.902-patches-1.1.tar.bz2 232640 +MD5 4ecbe985e304445695dc82af0a532988 XFree86-4.2.99.4-patches-1.1.tar.bz2 232640 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974 MD5 8fe0419ad622053ae0e98f42c23ac3d5 sis_drv_src_141202-1.tar.gz 317440 diff --git a/x11-base/xfree/xfree-4.2.99.902.ebuild b/x11-base/xfree/xfree-4.2.99.902.ebuild index fb167e776daf..4f5ffecbfc8d 100644 --- a/x11-base/xfree/xfree-4.2.99.902.ebuild +++ b/x11-base/xfree/xfree-4.2.99.902.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.2.99.902.ebuild,v 1.1 2003/02/25 00:20:47 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.99.902.ebuild,v 1.2 2003/02/25 00:52:22 seemant 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 ... @@ -54,7 +54,7 @@ SRC_PATH_SS="http://www.ibiblio.org/gentoo/gentoo-sources" HOMEPAGE="http://www.xfree.org" # Misc patches we may need to fetch .. -X_PATCHES="mirror://gentoo/XFree86-${PV}-patches-${PATCH_VER}.tar.bz2" +X_PATCHES="mirror://gentoo/XFree86-4.2.99.4-patches-${PATCH_VER}.tar.bz2" X_DRIVERS="http://people.mandrakesoft.com/~flepied/projects/wacom/xf86Wacom.c.gz http://www.probo.com/timr/savage-${SAVDRV_VER}.zip @@ -166,7 +166,7 @@ src_unpack() { # enable the nv driver on ppc if use ppc; then - epatch ${FILESDIR}/${PV}/${PV}-enable-nv-on-ppc.patch || die + epatch ${FILESDIR}/${PV}-patches/XFree86-${PV}-enable-nv-on-ppc.patch || die fi # Fix HOME and END keys to work in xterm, bug #15254 -- cgit v1.2.3-65-gdbad