added VIA driver and i8x0 patch

4 files changed, 25 insertions, 7 deletions

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 0eb5893e2be8..c98cf13531da 100644
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +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.145 2003/06/05 03:27:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.146 2003/06/05 13:13:49 seemant Exp $
+
+  05 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild:
+  Added via driver from cvs X -- tarballed it onto the mirrors. This should
+  close bug #19512 by Henrik Treadup <hetr9922@student.su.se>. Also added a
+  patch for dri corruption with i8x0 chipsets -- should close bug #8927 by
+  Jan Knipper <jan-gentoo@spline.de>.  PATCH_VER is 2.1.2
 
   04 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xfree-4.3.0-r3.ebuild:
   oops patch-2.1.1 is new replacement. 2.1.0 was slightly wonky. Also,
diff --git a/x11-base/xfree/Manifest b/x11-base/xfree/Manifest
index 2bd28abc3b61..d599203fd047 100644
--- a/x11-base/xfree/Manifest
+++ b/x11-base/xfree/Manifest
@@ -2,8 +2,8 @@ MD5 f11ed1feb06c079f6d570a0ca23d647c xfree-4.1.0-r6.ebuild 2963
 MD5 41435989d0a4656bf428d17461596d15 xfree-4.3.0-r2.ebuild 31211
 MD5 e98a09bb43033618521bf046d8d218fd xfree-4.3.0-r1.ebuild 25059
 MD5 bd9ddb285a3d2f153656f2639025a9e0 xfree-4.2.1-r2.ebuild 24195
-MD5 201c7ccdf0af2d423b532559780a21a2 xfree-4.3.0-r3.ebuild 31991
-MD5 28c0178982eb59cfacf8449c811d6108 ChangeLog 33865
+MD5 e9c99878f74ca191d1b2558d197eb520 xfree-4.3.0-r3.ebuild 31991
+MD5 8a4207db4c347fa656b5e32577fa3484 ChangeLog 33886
 MD5 c702fab31b9adac56477a9a5c16911c4 xfree-4.2.0-r12.ebuild 10302
 MD5 ab68703ef80727e333fd52ed5806df2d files/digest-xfree-4.1.0-r6 240
 MD5 10e681917f61e8ed068030a373694906 files/xfree-4.2.x-home_end-keys.patch 666
diff --git a/x11-base/xfree/files/digest-xfree-4.3.0-r3 b/x11-base/xfree/files/digest-xfree-4.3.0-r3
index 50de8e050296..faf40ef59447 100644
--- a/x11-base/xfree/files/digest-xfree-4.3.0-r3
+++ b/x11-base/xfree/files/digest-xfree-4.3.0-r3
@@ -5,11 +5,12 @@ MD5 567903747018f2534965ab6cb3976b38 X430src-4.tgz 12906091
 MD5 4dbdbe9a85c8f7f98dd0ee015a3c7b4f X430src-5.tgz 4388018
 MD5 163d9864e1353a4a9f992cb3843c240f X430src-6.tgz 8074919
 MD5 e002e70f24098ca4f62fabd1c2809ed1 X430src-7.tgz 9317241
-MD5 9c634442e2e3022d9608ddd0a38348d5 XFree86-4.3.0-patches-2.1.1.tar.bz2 494154
+MD5 1ca8fdbba7c58842a55f843298dcdb62 XFree86-4.3.0-patches-2.1.2.tar.bz2 495702
 MD5 e0c52f0e726e20db445e9708665a26d4 xfree86-dri-resume-v8.patch 15333
 MD5 222bffcae6c2be37ec5cd993037f4f45 xf86Wacom.c.gz 26156
 MD5 537bb3e2da7642bd979ebc1cafa8dce7 savage-1.1.27t.zip 76974
 MD5 e3848a87ea835bd80ed91f674e24fb02 sis_drv_src_180403-1.tar.gz 378880
+MD5 a5a77a87fac3a7e02270a9514207bb5d XFree86-4.3.0-drivers-via-0.1.tar.bz2 79965
 MD5 3d4ee581df78c9dacc6e97aa07a1af72 gemini-koi8-u.tar.bz2 439173
 MD5 4d7d5fdc4ed56c144ef998302581478c eurofonts-X11.tar.bz2 8811
 MD5 cfdef5d00cd4a7937ff4bc136dab1932 xfsft-encodings.tar.bz2 11811
diff --git a/x11-base/xfree/xfree-4.3.0-r3.ebuild b/x11-base/xfree/xfree-4.3.0-r3.ebuild
index 3d7e8fb795a3..86cac7ad1d57 100644
--- a/x11-base/xfree/xfree-4.3.0-r3.ebuild
+++ b/x11-base/xfree/xfree-4.3.0-r3.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-r3.ebuild,v 1.17 2003/06/05 04:27:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.3.0-r3.ebuild,v 1.18 2003/06/05 13:13:49 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 ...
@@ -38,12 +38,13 @@ strip-flags
 # Are we using a snapshot ?
 USE_SNAPSHOT="no"
 
-PATCH_VER="2.1.1"
+PATCH_VER="2.1.2"
 FT2_VER="2.1.3"
 XCUR_VER="0.3"
 SISDRV_VER="180403-1"
 SAVDRV_VER="1.1.27t"
 MGADRV_VER="1_3_0beta"
+VIADRV_VER="0.1"
 
 BASE_PV="${PV}"
 MY_SV="${BASE_PV//\.}"
@@ -58,7 +59,8 @@ X_PATCHES="mirror://gentoo/XFree86-${PV}-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
-	http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz"
+	http://www.winischhofer.net/sis/sis_drv_src_${SISDRV_VER}.tar.gz
+	mirror://gentoo/XFree86-4.3.0-drivers-via-${VIADRV_VER}.tar.bz2"
 #	ftp://ftp.matrox.com/pub/mga/archive/linux/2001/beta_1_3_0/mga-${MGADRV_VER}.tgz"
 #	3dfx? ( mirror://gentoo/glide3-headers.tar.bz2 )"
 # Updated Wacom driver:  http://people.mandrakesoft.com/~flepied/projects/wacom/
@@ -188,6 +190,12 @@ src_unpack() {
 	cd ${S}
 	eend 0
     
+	ebegin "Adding VIA driver"
+	cd ${WORKDIR}
+	unpack XFree86-${PV}-drivers-via-${VIADRV_VER}.tar.bz2
+	cd ${S}
+	eend 0
+	
 #	ebegin "Updating Matrox HAL driver"
 #	unpack mga-${MGADRV_VER}.tgz
 #	touch ${WORKDIR}/mga/HALlib/mgaHALlib.a
@@ -360,6 +368,9 @@ src_unpack() {
 		then
 			echo "#define HasGlide3 YES" >> config/cf/host.def
 		fi
+
+		# Compile the VIA driver
+		echo "#define XF86ExtraCardDrivers via" >> config/cf/host.def
 	fi
 
 	if [ "${ARCH}" = "hppa" ]