Update to xf86-video-ati-6.9.0.

NB: This package no longer supports Mach64 or Rage128 chips.
Please see the separate xf86-video-mach64 and xf86-video-r128 packages.

6.9.0:
In addition to lots of bug fixes there are several major new features:
- Improved EXA render support for r1xx/r2xx cards
- EXA render support for r3xx/r4xx/r5xx cards
- Textured video support for Xv (r1xx-r5xx)

6.8.0:
- mach64, r128, radeon ported to libpciaccess
- massive restructuring of ati wrapper
- radeon support for r5xx, rs6xx, and r6xx chips using ATOMBIOS
- return of zaphod mode support
- radeon support for centered modes using scalers (selectable via
output attributes)
- PAL tv-out fixed on supported chips
- initial support for render accel on r3xx/r4xx chips (rotation)
- fix TV option handling
- Xv RGB fixes
- XPRESS Xv fixes
- improve bios/driver interaction on radeon
- revert back to previous AGP mode behavior
- lots of bug fixes

7 files changed, 20 insertions, 75 deletions

diff --git a/x11/xf86-video-ati/DESCR b/x11/xf86-video-ati/DESCR
index 2527845d4fb..8300629834f 100644
--- a/x11/xf86-video-ati/DESCR
+++ b/x11/xf86-video-ati/DESCR
@@ -1,5 +1 @@
-This is the video driver for ATI cards for the modular Xorg server.
-Support hardware includes the following chipsets:
-- Radeon
-- Rage 128
-- Mach 64
+This is the video driver for ATI Radeon cards for the modular Xorg server.
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index 1110dd3d4d7..02302244a08 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.6 2008/05/24 21:45:17 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2008/07/14 04:01:06 tnn Exp $
 
-DISTNAME=	xf86-video-ati-6.6.3
-PKGREVISION=	1
+DISTNAME=	xf86-video-ati-6.9.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
-COMMENT=	Modular Xorg ATI video driver
+COMMENT=	Modular Xorg ATI Radeon video driver
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/x11/xf86-video-ati/PLIST b/x11/xf86-video-ati/PLIST
index 1035ddb30d3..ce26ab33061 100644
--- a/x11/xf86-video-ati/PLIST
+++ b/x11/xf86-video-ati/PLIST
@@ -1,13 +1,10 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/14 17:16:27 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/07/14 04:01:06 tnn Exp $
 lib/xorg/modules/drivers/ati_drv.la
-lib/xorg/modules/drivers/atimisc_drv.la
-lib/xorg/modules/drivers/r128_drv.la
 lib/xorg/modules/drivers/radeon_drv.la
 lib/xorg/modules/multimedia/theatre200_drv.la
 lib/xorg/modules/multimedia/theatre_detect_drv.la
 lib/xorg/modules/multimedia/theatre_drv.la
 man/man4/ati.4
-man/man4/r128.4
 man/man4/radeon.4
 @comment @dirrm lib/xorg/modules/multimedia
 @comment @dirrm lib/xorg/modules/drivers
diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo
index 1a7d627a4c2..46b9ae76385 100644
--- a/x11/xf86-video-ati/distinfo
+++ b/x11/xf86-video-ati/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/01/05 20:53:18 rillig Exp $
+$NetBSD: distinfo,v 1.5 2008/07/14 04:01:07 tnn Exp $
 
-SHA1 (xf86-video-ati-6.6.3.tar.bz2) = b911df1f4b41ad37028c708e2c95e5a729a32ede
-RMD160 (xf86-video-ati-6.6.3.tar.bz2) = a1c24c13ea88fa38f34e3f0540b53082ab2ae129
-Size (xf86-video-ati-6.6.3.tar.bz2) = 723083 bytes
-SHA1 (patch-aa) = 0f8a8514f58c0b535e8d7048025ebfaf097f53a0
-SHA1 (patch-ab) = 55cf92081fbeae3896d0621a5907ebfbfbdc4e84
-SHA1 (patch-ac) = e14593eb1a1308d0452ac87c2187287956e28050
+SHA1 (xf86-video-ati-6.9.0.tar.bz2) = 558f94b76e1b4c3c4429ab1fdc3e3c8523e414dc
+RMD160 (xf86-video-ati-6.9.0.tar.bz2) = 7c990dc8c770865d6c8a45e4861207c1dda07a13
+Size (xf86-video-ati-6.9.0.tar.bz2) = 777455 bytes
+SHA1 (patch-ac) = 605892e355f028d83b5db112f5c68a72bcc5e4b0
diff --git a/x11/xf86-video-ati/patches/patch-aa b/x11/xf86-video-ati/patches/patch-aa
deleted file mode 100644
index df2fbb6f959..00000000000
--- a/x11/xf86-video-ati/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/04/10 19:10:55 joerg Exp $
-
---- src/radeon_driver.c.orig	2007-04-10 20:15:31.000000000 +0200
-+++ src/radeon_driver.c
-@@ -7374,7 +7374,7 @@ static void RADEONSave(ScrnInfoPtr pScrn
-            vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE); /* Save mode only */
- # else
-            /* Save mode * & fonts & cmap */
--           vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS);
-+           vgaHWSave(pScrn, &hwp->SavedReg, VGA_SR_ALL);
- # endif
-            vgaHWLock(hwp);
-        }
-@@ -7450,7 +7450,7 @@ static void RADEONRestore(ScrnInfoPtr pS
-             */
-            vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE );
- # else
--           vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
-+           vgaHWRestore(pScrn, &hwp->SavedReg, VGA_SR_ALL );
- # endif
-            vgaHWLock(hwp);
-         } else {
-@@ -7465,7 +7465,7 @@ static void RADEONRestore(ScrnInfoPtr pS
- #if defined(__powerpc__)
-                vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE);
- #else
--               vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_MODE | VGA_SR_FONTS );
-+               vgaHWRestore(pScrn0, &hwp0->SavedReg, VGA_SR_ALL);
- #endif
-                vgaHWLock(hwp0);
-            }
diff --git a/x11/xf86-video-ati/patches/patch-ab b/x11/xf86-video-ati/patches/patch-ab
deleted file mode 100644
index 8bf5a40a0bb..00000000000
--- a/x11/xf86-video-ati/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/08/15 18:16:35 joerg Exp $
-
---- configure.ac.orig	2007-08-15 20:12:28.000000000 +0200
-+++ configure.ac
-@@ -84,7 +84,7 @@ sdkdir=$(pkg-config --variable=sdkdir xo
- # Checks for header files.
- AC_HEADER_STDC
- 
--if test "$DRI" != no; then
-+if test "x$DRI" = xauto; then
- 	AC_CHECK_FILE([${sdkdir}/dri.h],
-                       [have_dri_h="yes"], [have_dri_h="no"])
- 	AC_CHECK_FILE([${sdkdir}/sarea.h],
diff --git a/x11/xf86-video-ati/patches/patch-ac b/x11/xf86-video-ati/patches/patch-ac
index e7ec8454b6b..d29ae1c9f61 100644
--- a/x11/xf86-video-ati/patches/patch-ac
+++ b/x11/xf86-video-ati/patches/patch-ac
@@ -1,30 +1,29 @@
-$NetBSD: patch-ac,v 1.2 2008/01/05 20:53:18 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2008/07/14 04:01:07 tnn Exp $
 
---- configure.orig	2006-10-03 17:02:18.000000000 +0200
+--- configure.orig	2008-06-27 01:39:04.000000000 +0200
 +++ configure
-@@ -20261,7 +20261,7 @@ _ACEOF
+@@ -21440,23 +21440,15 @@ _ACEOF
  fi
  
  
 -if test "$DRI" != no; then
 +if test "x$DRI" = xauto; then
  	as_ac_File=`echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
- echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
- echo $ECHO_N "checking for ${sdkdir}/dri.h... $ECHO_C" >&6
-@@ -20982,16 +20982,8 @@ echo $ECHO_N "checking for $prefix/share
- if eval "test \"\${$as_ac_File+set}\" = set"; then
+ { echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
+ echo $ECHO_N "checking for ${sdkdir}/dri.h... $ECHO_C" >&6; }
+ if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 -  test "$cross_compiling" = yes &&
 -  { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
 -echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
 -   { (exit 1); exit 1; }; }
--if test -r "$prefix/share/X11/sgml/defs.ent"; then
+-if test -r "${sdkdir}/dri.h"; then
 -  eval "$as_ac_File=yes"
 -else
    eval "$as_ac_File=no"
  fi
 -fi
- echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
- if test `eval echo '${'$as_ac_File'}'` = yes; then
+ ac_res=`eval echo '${'$as_ac_File'}'`
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }