From 8fe3be0fcdc08539a56f66df71a221853726456f Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Sat, 15 Nov 2008 08:24:25 +0000
Subject: Update xf86-video-intel package to 2.4.3.

Here is the message on xorg-announce.

Hopefully this is the last 2.4.x release.  This one just includes a few
changes relative to 2.4.2, but the G4x stolen memory bit is an important
one.

Adam Jackson (1):
      Quirk: No LVDS on Dell Studio Hybrid

Carl Worth (1):
      Disable frame buffer compression by default for GM965.

Eric Anholt (1):
      Fix broken stolen memory counting on G4X.

Jesse Barnes (3):
      Don't allocate a pipe for hotplug detection
      Add a few programs to .gitignore
      Update version to 2.4.3 for release

Zhenyu Wang (3):
      Disable render standby
      Add backlight kernel method support on Asus and Eeepc
      quirk LVDS on Asus Eee box
---
 x11/xf86-video-intel/Makefile         |  4 +--
 x11/xf86-video-intel/distinfo         |  9 +++---
 x11/xf86-video-intel/patches/patch-ac | 54 -----------------------------------
 3 files changed, 6 insertions(+), 61 deletions(-)
 delete mode 100644 x11/xf86-video-intel/patches/patch-ac

(limited to 'x11/xf86-video-intel')

diff --git a/x11/xf86-video-intel/Makefile b/x11/xf86-video-intel/Makefile
index 79775097bc9..d8b4c30e114 100644
--- a/x11/xf86-video-intel/Makefile
+++ b/x11/xf86-video-intel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2008/09/19 14:56:00 tnn Exp $
+# $NetBSD: Makefile,v 1.15 2008/11/15 08:24:25 taca Exp $
 
-DISTNAME=	xf86-video-intel-2.4.2
+DISTNAME=	xf86-video-intel-2.4.3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-intel/distinfo b/x11/xf86-video-intel/distinfo
index a6c0236638d..f8bb3ee96f4 100644
--- a/x11/xf86-video-intel/distinfo
+++ b/x11/xf86-video-intel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2008/09/19 14:56:00 tnn Exp $
+$NetBSD: distinfo,v 1.13 2008/11/15 08:24:25 taca Exp $
 
-SHA1 (xf86-video-intel-2.4.2.tar.bz2) = fe071bf0c98b1cce96f6647d87a74217632fc2ad
-RMD160 (xf86-video-intel-2.4.2.tar.bz2) = 939bd7d3bc6f1709f312dcbcaadb2e1d0c95bc06
-Size (xf86-video-intel-2.4.2.tar.bz2) = 684445 bytes
+SHA1 (xf86-video-intel-2.4.3.tar.bz2) = 8335294c9b76b1f9daad5082d2290555ba2dbce5
+RMD160 (xf86-video-intel-2.4.3.tar.bz2) = 0d4fe4b7d517d1740c80fe61a8fc44af604ec60e
+Size (xf86-video-intel-2.4.3.tar.bz2) = 661105 bytes
 SHA1 (patch-aa) = d821ffb3e46769c0a5eda913b85a5b834d4478d6
 SHA1 (patch-ab) = 8d1b93e73a1b64958c09a229151b498ea61dc158
-SHA1 (patch-ac) = 89f62e11faded0847f42cfab78a3e5d17c938864
 SHA1 (patch-ad) = db9a5a55cd0c31e1e0d62b9cd94393143ab23c08
 SHA1 (patch-ba) = 9152649277b417278fb290e24dac8ad6fb911238
diff --git a/x11/xf86-video-intel/patches/patch-ac b/x11/xf86-video-intel/patches/patch-ac
deleted file mode 100644
index 26068df3482..00000000000
--- a/x11/xf86-video-intel/patches/patch-ac
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/09/19 14:56:00 tnn Exp $
-
-https://bugs.freedesktop.org/show_bug.cgi?id=17405
-
---- src/i830_crt.c
-+++ src/i830_crt.c
-@@ -352,10 +352,9 @@ i830_crt_detect(xf86OutputPtr output)
-     xf86OutputStatus	    status;
-     Bool		    connected;
- 
--    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
--    if (!crtc)
--	return XF86OutputStatusUnknown;
--
-+    /*
-+     * Try hotplug detection where supported
-+     */
-     if (IS_I945G(pI830) || IS_I945GM(pI830) || IS_I965G(pI830) ||
- 	    IS_G33CLASS(pI830)) {
- 	if (i830_crt_detect_hotplug(output))
-@@ -363,12 +362,19 @@ i830_crt_detect(xf86OutputPtr output)
- 	else
- 	    status = XF86OutputStatusDisconnected;
- 
--	goto out;
-+	goto done;
-     }
- 
-+    /*
-+     * DDC is next best, no flicker
-+     */
-+    crtc = i830GetLoadDetectPipe (output, NULL, &dpms_mode);
-+    if (!crtc)
-+	return XF86OutputStatusUnknown;
-+
-     if (i830_crt_detect_ddc(output)) {
- 	status = XF86OutputStatusConnected;
--	goto out;
-+	goto out_release_pipe;
-     }
- 
-     /* Use the load-detect method if we have no other way of telling. */
-@@ -378,9 +384,10 @@ i830_crt_detect(xf86OutputPtr output)
-     else
- 	status = XF86OutputStatusDisconnected;
- 
--out:
-+out_release_pipe:
-     i830ReleaseLoadDetectPipe (output, dpms_mode);
- 
-+done:
-     return status;
- }
- 
-- 
cgit v1.2.3