Updated xf86-video-glint to 1.2.9.

Adam Jackson (3):
     Remove mibstore.h
     Pass the pci device through to fbdevHWInit
     Adapt Block/WakeupHandler signature for ABI 23

Matt Turner (1):
     xf86-video-glint 1.2.9

Michael Lorenz (1):
     Fix I2C for DDC2.

4 files changed, 7 insertions, 61 deletions

diff --git a/x11/xf86-video-glint/Makefile b/x11/xf86-video-glint/Makefile
index 51c13c121ab..742965c5108 100644
--- a/x11/xf86-video-glint/Makefile
+++ b/x11/xf86-video-glint/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:19 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.20 2017/01/18 20:17:32 wiz Exp $
 
-DISTNAME=	xf86-video-glint-1.2.8
-PKGREVISION=	4
+DISTNAME=	xf86-video-glint-1.2.9
 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 6c5fbf1dda8..fecd767e3be 100644
--- a/x11/xf86-video-glint/distinfo
+++ b/x11/xf86-video-glint/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2016/11/16 22:12:12 wiz Exp $
+$NetBSD: distinfo,v 1.10 2017/01/18 20:17:32 wiz Exp $
 
-SHA1 (xf86-video-glint-1.2.8.tar.bz2) = 40f817c3aaac1b04bff28f4552bc4b4fe522013b
-RMD160 (xf86-video-glint-1.2.8.tar.bz2) = f1692d995cec5cb2f2a57471a5e2256f82d3467d
-SHA512 (xf86-video-glint-1.2.8.tar.bz2) = ea8c566877a8ef6d7c08bec317da62f41ffa080ca76f06587a2bbb2a976966ca4138fae60ede757cf470222912c915f4361aa90513901c370eae335818f33468
-Size (xf86-video-glint-1.2.8.tar.bz2) = 395371 bytes
-SHA1 (patch-src_compat-api.h) = 41208bc3e931da61a966b48aa6c54ac24c3a8737
-SHA1 (patch-src_glint__driver.c) = 831fdbaabaaf91e83669c4a9a1b0d6242efe20c6
+SHA1 (xf86-video-glint-1.2.9.tar.bz2) = 93b56f77d5d57f7b8746f58a5098a05ca9825b1d
+RMD160 (xf86-video-glint-1.2.9.tar.bz2) = 57a7e65babf625babd26e7a585aead47f8c8ce59
+SHA512 (xf86-video-glint-1.2.9.tar.bz2) = 29b573abc2c77992562ab72ea99dfac5fa4baee99404747c53494680fe750b9c096833cd6c8013aa85f7fb5db5bdbee2a9b26dff633a6a4fe2dc8cd9f0adff12
+Size (xf86-video-glint-1.2.9.tar.bz2) = 419524 bytes
diff --git a/x11/xf86-video-glint/patches/patch-src_compat-api.h b/x11/xf86-video-glint/patches/patch-src_compat-api.h
deleted file mode 100644
index 02bb5a65274..00000000000
--- a/x11/xf86-video-glint/patches/patch-src_compat-api.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:12:12 wiz Exp $
-
-Adapt Block/WakeupHandler signature for ABI 23.
-
---- src/compat-api.h.orig	2012-06-06 11:05:28.000000000 +0000
-+++ src/compat-api.h
-@@ -75,8 +75,13 @@
- 
- #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
- 
-+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
-+#define BLOCKHANDLER_ARGS arg, pTimeout
-+#else
- #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+#endif
- 
- #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
- #define CLOSE_SCREEN_ARGS pScreen
diff --git a/x11/xf86-video-glint/patches/patch-src_glint__driver.c b/x11/xf86-video-glint/patches/patch-src_glint__driver.c
deleted file mode 100644
index 0f8a52f6d05..00000000000
--- a/x11/xf86-video-glint/patches/patch-src_glint__driver.c
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-src_glint__driver.c,v 1.2 2016/11/16 22:12:12 wiz Exp $
-
-From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:38 -0400
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/glint_driver.c b/src/glint_driver.c
-index b6d20a9..aa78516 100644
---- src/glint_driver.c.orig	2012-07-16 02:50:47.000000000 +0000
-+++ src/glint_driver.c
-@@ -52,8 +52,6 @@
- #include "compiler.h"
- #include "mipointer.h"
- 
--#include "mibstore.h"
--
- #include "pm3_regs.h"
- #include "glint_regs.h"
- #include "IBM.h"
-@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
-         }
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
-