Sent a new snapshot to the mirrors bringing this driver in sync with CVS. This

snapshot includes both prior patches.  Also added the x11-libs/XvMC dep as
XvMC support has been added as required for the time being.
(Portage version: 2.0.51.22-r2)

6 files changed, 16 insertions, 24 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index ea58e7c2b29e..07234aa64603 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.5 2005/08/23 01:15:21 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.6 2005/09/02 21:33:56 joshuabaergen Exp $
+
+*xf86-video-i810-1.4.0-r3 (02 Sep 2005)
+
+  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/1.4.0-i810-unresolved-symbols.patch,
+  -xf86-video-i810-1.4.0-r2.ebuild, +xf86-video-i810-1.4.0-r3.ebuild:
+  Sent a new snapshot to the mirrors bringing this driver in sync with CVS.  This
+  snapshot includes both prior patches.  Also added the x11-libs/XvMC dep as
+  XvMC support has been added as required for the time being.
 
   23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   -xf86-video-i810-1.4.0.ebuild, -xf86-video-i810-1.4.0-r1.ebuild:
diff --git a/x11-drivers/xf86-video-i810/Manifest b/x11-drivers/xf86-video-i810/Manifest
index c3afe8009dd5..e1060aca32f4 100644
--- a/x11-drivers/xf86-video-i810/Manifest
+++ b/x11-drivers/xf86-video-i810/Manifest
@@ -1,5 +1,3 @@
-MD5 3d4a5cafb8a1052d83594ca96e3fbe63 ChangeLog 1221
-MD5 9795a25d39e0182c99af0b0c1ff22fa2 xf86-video-i810-1.4.0-r2.ebuild 769
-MD5 e40879b52fd68e970d8b2d9621fda3ad files/xf86-video-i810-1.4.0-add-i830-shadow.patch 10424
-MD5 d0714780555df4798544d62da8d2324b files/digest-xf86-video-i810-1.4.0-r2 74
-MD5 81208d2c8f6470c15008a06837952017 files/1.4.0-i810-unresolved-symbols.patch 613
+MD5 591e5e1f2b977e23b3aac1decd829a6d ChangeLog 1657
+MD5 85d6c5ac91140be1abc01147b1cc7e89 xf86-video-i810-1.4.0-r3.ebuild 688
+MD5 d07ac9320a6fe2848f59b5e9d4562569 files/digest-xf86-video-i810-1.4.0-r3 74
diff --git a/x11-drivers/xf86-video-i810/files/1.4.0-i810-unresolved-symbols.patch b/x11-drivers/xf86-video-i810/files/1.4.0-i810-unresolved-symbols.patch
deleted file mode 100644
index 3c4707fa7eb5..000000000000
--- a/x11-drivers/xf86-video-i810/files/1.4.0-i810-unresolved-symbols.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.freedesktop.org/show_bug.cgi?id=4066
-
---- src/Makefile.am.old	2005-08-12 21:03:59.000000000 -0600
-+++ src/Makefile.am	2005-08-12 21:04:19.000000000 -0600
-@@ -23,7 +23,7 @@
- # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
- # _ladir passes a dummy rpath to libtool so the thing will actually link
- # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
--AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV
-+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV -DBUILD_FOR_I830
- 
- i810_drv_la_LTLIBRARIES = i810_drv.la
- i810_drv_la_LDFLAGS = -module -avoid-version
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r2 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r2
deleted file mode 100644
index d09ff9cd887d..000000000000
--- a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 aaff7b8378d605730ef2db32c8b7149b xf86-video-i810-1.4.0.tar.bz2 322808
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r3 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r3
new file mode 100644
index 000000000000..9609d778c845
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.4.0-r3
@@ -0,0 +1 @@
+MD5 798d967e258c4104d4e3338abfcf03cb xf86-video-i810-1.4.0.tar.bz2 369980
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r2.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r3.ebuild
index 0eaa8a674d9d..03ad35fefc8e 100644
--- a/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r2.ebuild
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r3.ebuild
@@ -1,21 +1,19 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r2.ebuild,v 1.1 2005/08/23 01:14:39 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/xf86-video-i810-1.4.0-r3.ebuild,v 1.1 2005/09/02 21:33:56 joshuabaergen Exp $
 
 # Must be before x-modular eclass is inherited
 SNAPSHOT="yes"
 
 inherit x-modular
 
-PATCHES="${FILESDIR}/${P}-add-i830-shadow.patch
-	${FILESDIR}/${PV}-i810-unresolved-symbols.patch"
-
 DESCRIPTION="X.Org driver for i810 cards"
 KEYWORDS="~x86"
 IUSE="dri"
 RDEPEND="x11-base/xorg-server"
 DEPEND="${RDEPEND}
 	x11-proto/xproto
+	x11-libs/libXvMC
 	dri? ( x11-proto/xf86driproto )"
 
 CONFIGURE_OPTIONS="$(use_enable dri)"