Update to 2.8.0:

We are pleased to present this major release of the xf86-video-intel
driver. This release is very similar to the 2.7.99.902 release
candidate but includes a couple of additional bug fixes, (for bugs
#22760 and @22483).

Compared to the 2.7 releases this driver contains several new features
and many bug fixes. The driver now depends on X server 1.6 or later,
and eliminates several obsolete code paths, (XAA and EXA removed in
favor of UXA, DRI1 support eliminated). The driver certainly will work
best with an i915 module from a recent kernel (2.6.31) and with
kernel-modesetting (KMS, specified by loading i915 with the option
"modeset=1").

4 files changed, 22 insertions, 24 deletions

diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 38482a960e7..c200d1b844b 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,19 +1,18 @@
-# $NetBSD: Makefile,v 1.19 2009/06/07 11:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2009/08/09 22:40:15 wiz Exp $
 
-DISTNAME=	xf86-video-intel-2.7.1
-PKGREVISION=	1
+DISTNAME=	xf86-video-intel-2.8.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
 
-CONFLICTS+=	xf86-video-i810-[0-9]*
-
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg Intel video driver
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+CONFLICTS+=	xf86-video-i810-[0-9]*
+
 CONFIGURE_ARGS+=	--enable-dri
 
 GNU_CONFIGURE=	YES
diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo
index 2563051c29f..487df0f35d9 100644
--- a/x11/xf86-video-intel/distinfo
+++ b/x11/xf86-video-intel/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2009/05/14 12:57:57 taca Exp $
+$NetBSD: distinfo,v 1.17 2009/08/09 22:40:15 wiz Exp $
 
-SHA1 (xf86-video-intel-2.7.1.tar.bz2) = f863ee65b4b7779077af9f819b07033264284628
-RMD160 (xf86-video-intel-2.7.1.tar.bz2) = 25208fe03f0fe849974a703f4a81e734e67cad18
-Size (xf86-video-intel-2.7.1.tar.bz2) = 780625 bytes
-SHA1 (patch-ad) = db9a5a55cd0c31e1e0d62b9cd94393143ab23c08
+SHA1 (xf86-video-intel-2.8.0.tar.bz2) = 77ea9054e46662d84d5b33a088a48cb175662915
+RMD160 (xf86-video-intel-2.8.0.tar.bz2) = da08598a0f19bab17f014a8ef84ccfbe028ae023
+Size (xf86-video-intel-2.8.0.tar.bz2) = 750394 bytes
+SHA1 (patch-aa) = 1cdd617d6ad213ec6e619822345abdd7a3f2fb28
 SHA1 (patch-ag) = 68f282d59e03c74727de4577eb48297d9022e542
diff --git a/x11/xf86-video-intel/patches/patch-aa b/x11/xf86-video-intel/patches/patch-aa
new file mode 100644
index 00000000000..32701f3a38f
--- /dev/null
+++ b/x11/xf86-video-intel/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2009/08/09 22:40:15 wiz Exp $
+
+--- configure.orig	2009-08-09 22:38:02.000000000 +0000
++++ configure
+@@ -12621,7 +12621,7 @@ if test "${enable_debug+set}" = set; the
+   enableval=$enable_debug;
+ fi
+ 
+-if test "x$enableval" == "xyes" ; then
++if test "x$enableval" = "xyes" ; then
+ 	DEBUGFLAGS="-g"
+ else
+ 	DEBUGFLAGS=""
diff --git a/x11/xf86-video-intel/patches/patch-ad b/x11/xf86-video-intel/patches/patch-ad
deleted file mode 100644
index 4acce0af489..00000000000
--- a/x11/xf86-video-intel/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2008/03/20 17:00:38 joerg Exp $
-
---- src/i830_xaa.c.orig	2008-03-19 23:27:58.000000000 +0100
-+++ src/i830_xaa.c
-@@ -654,8 +654,7 @@ I830SubsequentColorExpandScanline(ScrnIn
-     pI830->BR[9] += pScrn->displayWidth * pI830->cpp;
-     I830GetNextScanlineColorExpandBuffer(pScrn);
- 
--    if (IS_I965G(pI830))
--      I830EmitFlush(pScrn);
-+    I830EmitFlush(pScrn);
- }
- 
- #if DO_SCANLINE_IMAGE_WRITE