From 2431ba9961d1e0b388a8516d456b329dbedc99f9 Mon Sep 17 00:00:00 2001
From: hasso <hasso>
Date: Tue, 9 Jun 2009 05:54:05 +0000
Subject: Update to 1.2.2. Changes since 1.2.1:

Adam Jackson (3):
      Uninclude xf86Version.h
      Move DDC before mode validation so the EDID modes actually take effect.
      Remove bizarre use of ISA setup

Dave Airlie (2):
      glint: fix build on alpha for pciaccess.
      glint 1.2.2

Paulo Cesar Pereira de Andrade (1):
      Remove dependency on cfb8_32.
---
 x11/xf86-video-glint/Makefile         |  5 ++---
 x11/xf86-video-glint/distinfo         | 10 +++++-----
 x11/xf86-video-glint/patches/patch-ab | 14 +++++++-------
 3 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'x11')

diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index d9b5cd35926..b6a23bb83df 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2009/06/07 11:24:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/06/09 05:54:05 hasso Exp $
 #
 
-DISTNAME=	xf86-video-glint-1.2.1
-PKGREVISION=	2
+DISTNAME=	xf86-video-glint-1.2.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-glint/distinfo b/x11/xf86-video-glint/distinfo
index 318f9cd4ad8..5283da93eed 100644
--- a/x11/xf86-video-glint/distinfo
+++ b/x11/xf86-video-glint/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2008/08/09 15:32:44 tnn Exp $
+$NetBSD: distinfo,v 1.4 2009/06/09 05:54:05 hasso Exp $
 
-SHA1 (xf86-video-glint-1.2.1.tar.bz2) = 9e4959c2a39c22bf4a81b1eba4ec809f9c571bc8
-RMD160 (xf86-video-glint-1.2.1.tar.bz2) = af9fb007636212c707a781a40e50736d06da1117
-Size (xf86-video-glint-1.2.1.tar.bz2) = 348552 bytes
+SHA1 (xf86-video-glint-1.2.2.tar.bz2) = 4b352d503f747172790605ea3dcded412bbf1921
+RMD160 (xf86-video-glint-1.2.2.tar.bz2) = 1acedff53d368b733d47d8c7b5a7387cb63a74a0
+Size (xf86-video-glint-1.2.2.tar.bz2) = 348742 bytes
 SHA1 (patch-aa) = 0dd7ee7133771a1ae4d46e4ce994feda6e918b7f
-SHA1 (patch-ab) = 456d193ccfda4a01572fe46559c93f9132238075
+SHA1 (patch-ab) = bb628ca4eadc33c3920baa02ca8fc71257eb7678
diff --git a/x11/xf86-video-glint/patches/patch-ab b/x11/xf86-video-glint/patches/patch-ab
index fb3726caa75..ff8672d21a3 100644
--- a/x11/xf86-video-glint/patches/patch-ab
+++ b/x11/xf86-video-glint/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2008/08/09 15:32:44 tnn Exp $
+$NetBSD: patch-ab,v 1.3 2009/06/09 05:54:05 hasso Exp $
 
---- configure.orig	2008-06-30 17:56:57.000000000 +0200
-+++ configure
-@@ -21405,7 +21405,7 @@ _ACEOF
+--- configure.orig	2008-12-22 06:32:28 +0200
++++ configure	2009-06-09 08:33:39 +0300
+@@ -21700,7 +21700,7 @@ _ACEOF
  fi
  
  
 -if test "$DRI" != no; then
 +if test "$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; }
+         as_ac_File=`$as_echo "ac_cv_file_${sdkdir}/dri.h" | $as_tr_sh`
+ { $as_echo "$as_me:$LINENO: checking for ${sdkdir}/dri.h" >&5
+ $as_echo_n "checking for ${sdkdir}/dri.h... " >&6; }
-- 
cgit v1.2.3