Version bump. Includes previous patch and various other fixes, including

improved i915 textured video support.
Package-Manager: portage-2.1.1_pre4-r4

3 files changed, 44 insertions, 159 deletions

diff --git a/x11-drivers/xf86-video-i810/ChangeLog b/x11-drivers/xf86-video-i810/ChangeLog
index f95c3d37bd75..fd8f80c2341b 100644
--- a/x11-drivers/xf86-video-i810/ChangeLog
+++ b/x11-drivers/xf86-video-i810/ChangeLog
@@ -1,164 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-i810
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.31 2006/08/10 22:27:25 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i810/ChangeLog,v 1.32 2006/08/11 00:05:35 joshuabaergen Exp $
 
-*xf86-video-i810-1.6.4-r1 (10 Aug 2006)
+*xf86-video-i810-1.6.5 (11 Aug 2006)
 
-  10 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +files/1.6.4-fix_dri_abi.patch, -xf86-video-i810-1.6.4.ebuild,
-  +xf86-video-i810-1.6.4-r1.ebuild:
-  Add a patch from upstream that fixes the DRI ABI.  (Bug #143419, Sebastian
-  Bergmann.  Thanks to Roderick B. Greening for the upstream poking.)
-
-*xf86-video-i810-1.6.4 (10 Aug 2006)
-
-  10 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.6.4.ebuild:
-  Version bump.  Adds MergedFB and i965 support.
-
-*xf86-video-i810-1.6.1 (29 Jul 2006)
-
-  29 Jul 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.6.1.ebuild:
-  Version bump.  Includes a bunch of code cleanups and fixes.
-
-  10 Jul 2006; Aron Griffis <agriffis@gentoo.org>
-  xf86-video-i810-1.6.0.ebuild:
-  Mark 1.6.0 stable on ia64
-
-  01 Jul 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xf86-video-i810-1.6.0.ebuild:
-  stable on sh
-
-  30 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  xf86-video-i810-1.4.1.3.ebuild:
-  Stable on amd64.
-
-  30 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xf86-video-i810-1.4.1.3.ebuild:
-  x86 stable.
-
-  17 Jun 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xf86-video-i810-1.6.0.ebuild:
-  ~x86-fbsd keyworded the lower version but not this.
-
-  16 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
-  xf86-video-i810-1.4.1.3.ebuild:
-  Add ~x86-fbsd keyword.
-
-  14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  -xf86-video-i810-1.5.1.0.ebuild:
-  Remove older masked version.
-
-*xf86-video-i810-1.6.0 (14 Apr 2006)
-
-  14 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.6.0.ebuild:
-  Bump for 7.1 RC1.
-
-  07 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
-  xf86-video-i810-1.5.1.0.ebuild:
-  (#129072) Change xorg-server dep to minimum 1.0.2 for randrstr.h. Fix by
-  Alberto Bertogli.
-
-*xf86-video-i810-1.5.1.0 (01 Apr 2006)
-
-  01 Apr 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.5.1.0.ebuild:
-  Add new i810 driver.  The 1.5.x series will only work with Mesa 6.5/HEAD.
-
-  30 Jan 2006; Patrick McLean <chutzpah@gentoo.org>
-  xf86-video-i810-1.4.1.3.ebuild:
-  Added to ~amd64.
-
-  26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  -xf86-video-i810-1.4.1.1.ebuild, -xf86-video-i810-1.4.1.2.ebuild:
-  Pull old versions.
-
-*xf86-video-i810-1.4.1.3 (23 Dec 2005)
-
-  23 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.4.1.3.ebuild:
-  Bump for 7.0.
-
-*xf86-video-i810-1.4.1.2 (18 Dec 2005)
-
-  18 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.4.1.2.ebuild:
-  Bump for 7.0RC4.
-
-  09 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  files/digest-xf86-video-i810-1.4.1.1, Manifest:
-  Update digest to match patch introduced by x-modular.eclass changes.
-
-  09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>;
-  -xf86-video-i810-1.4.0-r3.ebuild, -xf86-video-i810-1.4.0.1.ebuild,
-  -xf86-video-i810-1.4.1.ebuild:
-  Pull old versions.
-
-*xf86-video-i810-1.4.1.1 (04 Dec 2005)
-
-  04 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.4.1.1.ebuild:
-  Bump for 7.0RC3.
-
-*xf86-video-i810-1.4.1 (11 Nov 2005)
-
-  11 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.4.1.ebuild:
-  Bump for 7.0RC2.
-
-*xf86-video-i810-1.4.0.1 (20 Oct 2005)
-
-  20 Oct 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  +xf86-video-i810-1.4.0.1.ebuild:
-  Bump for 7.0 RC1.
-
-  09 Sep 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml:
-  Add metadata.
-
-  06 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  xf86-video-i810-1.4.0-r3.ebuild:
-  Moved x11-libs/libXvMC from DEPEND to RDEPEND.
-
-  02 Sep 2005; Joshua Baergen <joshuabaergen@gentoo.org>
-  -files/xf86-video-i810-1.4.0-add-i830-shadow.patch:
-  Oops, missed removing this patch in the first run.
-
-*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:
-  Pull old versions.
-
-*xf86-video-i810-1.4.0-r2 (23 Aug 2005)
-
-  23 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
-  +files/1.4.0-i810-unresolved-symbols.patch,
-  +xf86-video-i810-1.4.0-r2.ebuild:
-  (fd.o #4066) Add 1.4.0-i810-unresolved-symbols.patch to make i810 driver work.
-
-  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; -files/dri.patch:
-  Pull unused patch.
-
-*xf86-video-i810-1.4.0-r1 (12 Aug 2005)
-
-  12 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
-  +files/xf86-video-i810-1.4.0-add-i830-shadow.patch,
-  +xf86-video-i810-1.4.0-r1.ebuild:
-  Bump to link in i830_shadow.c. This should allow X to start properly.
-  Reported by Joshua Baerge <joshuabaergen@gentoo.org>.
-
-*xf86-video-i810-1.4.0 (08 Aug 2005)
-
-  08 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/dri.patch,
-  +xf86-video-i810-1.4.0.ebuild:
-  Initial commit for modular X.
+  11 Aug 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  -files/1.6.4-fix_dri_abi.patch, -xf86-video-i810-1.6.4-r1.ebuild,
+  +xf86-video-i810-1.6.5.ebuild:
+  Version bump.  Includes previous patch and various other fixes, including
+  improved i915 textured video support.
 
diff --git a/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.5 b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.5
new file mode 100644
index 000000000000..379c21071f1b
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/files/digest-xf86-video-i810-1.6.5
@@ -0,0 +1,6 @@
+MD5 1b8cfd2923836ee93eda69abe50dda04 x11-driver-patches-1.tar.bz2 389
+RMD160 0c57d4b235d83f3d7c46691c13857fd121ddec2d x11-driver-patches-1.tar.bz2 389
+SHA256 64787d5b57d2845c0fa9297a9d924093ba191fc3551798239d9983f0bcca9b3e x11-driver-patches-1.tar.bz2 389
+MD5 fc1e0da3430551bf25a7babf7ccfd3bf xf86-video-i810-1.6.5.tar.bz2 439503
+RMD160 1a55fdfe89f855dd7bf1e16619c89da42383eef6 xf86-video-i810-1.6.5.tar.bz2 439503
+SHA256 30d0cd555d8b8b5bb53d93eaae1ad2aecb5c94a760e2346d60b6e194c254e40f xf86-video-i810-1.6.5.tar.bz2 439503
diff --git a/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild
new file mode 100644
index 000000000000..c2d2cb226447
--- /dev/null
+++ b/x11-drivers/xf86-video-i810/xf86-video-i810-1.6.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2006 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.6.5.ebuild,v 1.1 2006/08/11 00:05:35 joshuabaergen Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org driver for Intel cards"
+KEYWORDS="~amd64 ~ia64 ~sh ~x86 ~x86-fbsd"
+IUSE="dri"
+RDEPEND=">=x11-base/xorg-server-1.0.99
+	x11-libs/libXvMC"
+DEPEND="${RDEPEND}
+	x11-proto/fontsproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dri? ( x11-proto/xf86driproto
+			>=x11-libs/libdrm-2
+			x11-libs/libX11 )"
+
+CONFIGURE_OPTIONS="$(use_enable dri)"
+
+pkg_setup() {
+	if use dri && ! built_with_use x11-base/xorg-server dri; then
+		die "Build x11-base/xorg-server with USE=dri."
+	fi
+}