summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/xf86-video-ati/Makefile5
-rw-r--r--x11/xf86-video-ati/distinfo9
-rw-r--r--x11/xf86-video-ati/patches/patch-aa19
3 files changed, 6 insertions, 27 deletions
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile
index e5b201e0fc7..051d1ef5b87 100644
--- a/x11/xf86-video-ati/Makefile
+++ b/x11/xf86-video-ati/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2008/09/18 20:31:25 bjs Exp $
+# $NetBSD: Makefile,v 1.9 2009/02/25 23:29:11 wiz Exp $
-DISTNAME= xf86-video-ati-6.9.0
-PKGREVISION= 1
+DISTNAME= xf86-video-ati-6.11.0
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo
index bbd7ab5d1e2..098e36f33b3 100644
--- a/x11/xf86-video-ati/distinfo
+++ b/x11/xf86-video-ati/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/09/18 20:31:26 bjs Exp $
+$NetBSD: distinfo,v 1.7 2009/02/25 23:29:11 wiz Exp $
-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-aa) = fbdfc1d962205242332afc9524632723af82e8bf
+SHA1 (xf86-video-ati-6.11.0.tar.bz2) = fbcba3a7c495e0d08e3a43a05c3277666206ff7b
+RMD160 (xf86-video-ati-6.11.0.tar.bz2) = e8ff02eb3730ea127d2dbafb65138ec73f1044df
+Size (xf86-video-ati-6.11.0.tar.bz2) = 833773 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 2e8c5a6dacd..00000000000
--- a/x11/xf86-video-ati/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/09/18 20:31:26 bjs Exp $
-
-This patch ensures the driver won't use the DRM's MODESET_CTL
-unless direct rendering is enabled.
-
-From Owain Ainsworth <oga@openbsd.org>.
-
---- src/legacy_crtc.c.orig 2008-06-25 02:56:40.000000000 -0400
-+++ src/legacy_crtc.c
-@@ -625,6 +625,9 @@ radeon_crtc_modeset_ioctl(xf86CrtcPtr cr
- RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
- struct drm_modeset_ctl modeset;
-
-+ if (!info->directRenderingEnabled)
-+ return;
-+
- modeset.crtc = radeon_crtc->crtc_id;
- modeset.cmd = post ? _DRM_POST_MODESET : _DRM_PRE_MODESET;
-