Updated xf86-video-nv to 2.1.21.

Adam Jackson (2):
     Remove mibstore.h
     Adapt Block/WakeupHandler signature for ABI 23

Egbert Eich (1):
     init: Initialize VGA IOBase before using it

Jeremy White (1):
     Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.

Matt Turner (1):
     xf86-video-nv 2.1.21

Matthieu Herrb (1):
     Fix shadow framebuffer implementation.

8 files changed, 7 insertions, 172 deletions

diff --git a/x11/xf86-video-nv/Makefile b/x11/xf86-video-nv/Makefile
index 21ee7aaaf77..10657d50097 100644
--- a/x11/xf86-video-nv/Makefile
+++ b/x11/xf86-video-nv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2016/02/26 11:27:19 jperkin Exp $
+# $NetBSD: Makefile,v 1.31 2017/01/18 20:16:04 wiz Exp $
 
-DISTNAME=	xf86-video-nv-2.1.20
-PKGREVISION=	4
+DISTNAME=	xf86-video-nv-2.1.21
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-nv/distinfo b/x11/xf86-video-nv/distinfo
index 84b42965dcd..9d2e8bdd05f 100644
--- a/x11/xf86-video-nv/distinfo
+++ b/x11/xf86-video-nv/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.19 2016/11/16 22:03:40 wiz Exp $
+$NetBSD: distinfo,v 1.20 2017/01/18 20:16:04 wiz Exp $
 
-SHA1 (xf86-video-nv-2.1.20.tar.bz2) = 42b129be471d16444c5a7b443491e8d9e3e5df1a
-RMD160 (xf86-video-nv-2.1.20.tar.bz2) = 1245e6fb40728ec5b874d1a7cbc6836c39704837
-SHA512 (xf86-video-nv-2.1.20.tar.bz2) = f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373
-Size (xf86-video-nv-2.1.20.tar.bz2) = 396982 bytes
-SHA1 (patch-src_compat-api.h) = 5f5a99e24c9818b1de5039ad5b1cd10adb963aba
-SHA1 (patch-src_g80__driver.c) = 7a009a40cb21973180befe403e2e14979030986a
-SHA1 (patch-src_nv__driver.c) = 3fef5f0ed734115e801c5cf14fdecb4cea17675b
-SHA1 (patch-src_nv__include.h) = 94e101db1ba731d9187753f3b1c8285f5fdd0c90
-SHA1 (patch-src_riva_driver.c) = 2820b601f3244cce48b6cd93c51e03bc0bff507f
-SHA1 (patch-src_riva_include.h) = 84859b666ad1e4a26e09876a63e5131adb35b513
+SHA1 (xf86-video-nv-2.1.21.tar.bz2) = 708cab4a59649fc0b9816ffda580a9b7e57236be
+RMD160 (xf86-video-nv-2.1.21.tar.bz2) = 132b8b6385706900800f18524ada2fa6a412c4a1
+SHA512 (xf86-video-nv-2.1.21.tar.bz2) = 97cec43100b00609d43cf45937bafea387fd656cb5e321fcbed426973320097ba6601e4e548026618b3cf0c480f58956874a201791dc0cc39297b5fd54979ca7
+Size (xf86-video-nv-2.1.21.tar.bz2) = 424091 bytes
diff --git a/x11/xf86-video-nv/patches/patch-src_compat-api.h b/x11/xf86-video-nv/patches/patch-src_compat-api.h
deleted file mode 100644
index 3c077deeff3..00000000000
--- a/x11/xf86-video-nv/patches/patch-src_compat-api.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 22:03:40 wiz Exp $
-
-Adapt Block/WakeupHandler signature for ABI 23.
-
---- src/compat-api.h.orig	2012-07-17 06:47:03.000000000 +0000
-+++ src/compat-api.h
-@@ -78,11 +78,19 @@
- 
- #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
-+
-+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
-+#define WAKEUPHANDLER_ARGS arg, result
-+#else
- #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
- #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
- 
- #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask
- #define WAKEUPHANDLER_ARGS arg, result, read_mask
-+#endif
- 
- #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
- #define CLOSE_SCREEN_ARGS pScreen
diff --git a/x11/xf86-video-nv/patches/patch-src_g80__driver.c b/x11/xf86-video-nv/patches/patch-src_g80__driver.c
deleted file mode 100644
index 1ba22edc6ae..00000000000
--- a/x11/xf86-video-nv/patches/patch-src_g80__driver.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-src_g80__driver.c,v 1.1 2015/04/02 22:16:47 tnn Exp $
-
-From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:49 -0400
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/g80_driver.c b/src/g80_driver.c
-index cc4e197..719b96c 100644
---- src/g80_driver.c.orig	2012-07-17 06:47:02.000000000 +0000
-+++ src/g80_driver.c
-@@ -34,7 +34,6 @@
- #include <xf86Resources.h>
- #endif
- #include <mipointer.h>
--#include <mibstore.h>
- #include <micmap.h>
- #include <xf86cmap.h>
- #include <fb.h>
-@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
-         }
-     }
- 
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
diff --git a/x11/xf86-video-nv/patches/patch-src_nv__driver.c b/x11/xf86-video-nv/patches/patch-src_nv__driver.c
deleted file mode 100644
index 1800a165fb2..00000000000
--- a/x11/xf86-video-nv/patches/patch-src_nv__driver.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_nv__driver.c,v 1.1 2015/04/02 22:16:47 tnn Exp $
-
-From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:49 -0400
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 6dad6e5..8f35334 100644
---- src/nv_driver.c.orig	2012-07-17 06:47:02.000000000 +0000
-+++ src/nv_driver.c
-@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
-     if (!pNv->NoAccel)
- 	NVAccelInit(pScreen);
-     
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
diff --git a/x11/xf86-video-nv/patches/patch-src_nv__include.h b/x11/xf86-video-nv/patches/patch-src_nv__include.h
deleted file mode 100644
index 52b4b323b68..00000000000
--- a/x11/xf86-video-nv/patches/patch-src_nv__include.h
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-src_nv__include.h,v 1.1 2015/04/02 22:16:47 tnn Exp $
-
-From 49ee1c26ea982e302169c949ebd0abb9d8ef362c Mon Sep 17 00:00:00 2001
-From: Jeremy White <jwhite@codeweavers.com>
-Date: Thu, 21 Mar 2013 08:59:06 -0700
-Subject: Include xf86Modes.h to use functions from
- hw/xfree86/modes/xf86Modes.c.
-
-Signed-off-by: Jeremy White <jwhite@codeweavers.com>
-Reviewed-by: Robert Morell <rmorell@nvidia.com>
-Reviewed-by: Aaron Plattner <aplattner@nvidia.com>
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-
-From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:49 -0400
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/nv_include.h b/src/nv_include.h
-index f174eef..72c74d5 100644
---- src/nv_include.h.orig	2012-07-17 06:48:19.000000000 +0000
-+++ src/nv_include.h
-@@ -24,12 +24,10 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- #include "micmap.h"
- 
- #include "xf86DDC.h"
-+#include "xf86Modes.h"
- 
- #include "vbe.h"
- 
diff --git a/x11/xf86-video-nv/patches/patch-src_riva_driver.c b/x11/xf86-video-nv/patches/patch-src_riva_driver.c
deleted file mode 100644
index ae2399ba62b..00000000000
--- a/x11/xf86-video-nv/patches/patch-src_riva_driver.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_riva_driver.c,v 1.1 2015/04/02 22:16:47 tnn Exp $
-
-From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:49 -0400
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/riva_driver.c b/src/riva_driver.c
-index e0667ef..759501e 100644
---- src/riva_driver.c.orig	2012-07-17 06:47:02.000000000 +0000
-+++ src/riva_driver.c
-@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
-     if (!pRiva->NoAccel)
- 	RivaAccelInit(pScreen);
-     
--    miInitializeBackingStore(pScreen);
-     xf86SetBackingStore(pScreen);
-     xf86SetSilkenMouse(pScreen);
- 
diff --git a/x11/xf86-video-nv/patches/patch-src_riva_include.h b/x11/xf86-video-nv/patches/patch-src_riva_include.h
deleted file mode 100644
index 4d12adf13f0..00000000000
--- a/x11/xf86-video-nv/patches/patch-src_riva_include.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_riva_include.h,v 1.1 2015/04/02 22:16:47 tnn Exp $
-
-From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:49 -0400
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/riva_include.h b/src/riva_include.h
-index f2c5302..c7aeef7 100644
---- src/riva_include.h.orig	2012-07-17 06:48:45.000000000 +0000
-+++ src/riva_include.h
-@@ -22,9 +22,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- #include "micmap.h"
- 
- #include "xf86DDC.h"