Update xf86-video-rendition to 4.2.6:

Just a few accumulated build fixes.

Adam Jackson (4):
      Remove mibstore.h
      Fix build against xserver 1.17
      Remove dependency on xf86PciInfo.h
      rendition 4.2.6

4 files changed, 7 insertions, 131 deletions

diff --git a/x11/xf86-video-rendition/Makefile b/x11/xf86-video-rendition/Makefile
index ac06ce86c79..2c475fd77c0 100644
--- a/x11/xf86-video-rendition/Makefile
+++ b/x11/xf86-video-rendition/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2015/04/25 14:25:23 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.17 2015/11/12 16:14:06 wiz Exp $
 
-DISTNAME=	xf86-video-rendition-4.2.5
-PKGREVISION=	3
+DISTNAME=	xf86-video-rendition-4.2.6
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-rendition/distinfo b/x11/xf86-video-rendition/distinfo
index f744b371041..87d552aebe8 100644
--- a/x11/xf86-video-rendition/distinfo
+++ b/x11/xf86-video-rendition/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 03:29:03 agc Exp $
+$NetBSD: distinfo,v 1.9 2015/11/12 16:14:06 wiz Exp $
 
-SHA1 (xf86-video-rendition-4.2.5.tar.bz2) = 930e99e4d44418b1e55f11a2a8525b42b0e2d3b5
-RMD160 (xf86-video-rendition-4.2.5.tar.bz2) = cbd0441ed0aa4bf13765fecfe9ab246fab951ab7
-SHA512 (xf86-video-rendition-4.2.5.tar.bz2) = 203529e2a9c917362ac7c9b4247a9a0a4a7e1911bd022a26b00f467ec4cfd9ce742465aba29618cbfaa5ac5ff0b43e5a54f651e45e81aa950776685e4f74ba72
-Size (xf86-video-rendition-4.2.5.tar.bz2) = 356351 bytes
-SHA1 (patch-src_rendition.c) = 186c838964c83f34e39ff74c7525b19601a2577e
-SHA1 (patch-src_rendition.h) = 1d69e2b9e92de84d25027a67c09077baf712ece3
+SHA1 (xf86-video-rendition-4.2.6.tar.bz2) = b0c097890320be53ca678bd6f18de4c39e2409e8
+RMD160 (xf86-video-rendition-4.2.6.tar.bz2) = 056ae9c3d1771e72a20666907929e962b95108f3
+SHA512 (xf86-video-rendition-4.2.6.tar.bz2) = ef4910b11ede69af89a7ee60039113a35c03f2bab5f9433eefbb4ed685b0260f630e9047fa8ab60a7f0e8a0958a24f8821b719e061c26bc51ff7736b500ddbc7
+Size (xf86-video-rendition-4.2.6.tar.bz2) = 362408 bytes
diff --git a/x11/xf86-video-rendition/patches/patch-src_rendition.c b/x11/xf86-video-rendition/patches/patch-src_rendition.c
deleted file mode 100644
index d1d4c8895b5..00000000000
--- a/x11/xf86-video-rendition/patches/patch-src_rendition.c
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-src_rendition.c,v 1.1 2015/04/02 22:16:47 tnn Exp $
-
-From 30a4b73644ee22904824d4847e44ca69369fad02 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Sep 2014 10:21:58 -0400
-Subject: Fix build against xserver 1.17
-
-Also port from pci_device_map_region to pci_device_map_range.  Somewhat
-alarming that the previous code was using map_region but unmap_range...
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-From 3a3ee1c45e54a808947cc26ca11f0a5299571053 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 25 Sep 2012 08:54:50 -0400
-Subject: Remove mibstore.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
---- src/rendition.c.orig	2015-04-02 19:20:42.000000000 +0000
-+++ src/rendition.c
-@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DEC
-     fbPictureInit (pScreen, 0, 0);
- 
-     xf86SetBlackWhitePixels(pScreen);
--    miInitializeBackingStore(pScreen);
-    
-     /*********************************************************/
-     /* The actual setup of the driver-specific code          */
-@@ -1372,6 +1371,18 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
-        /* Override on users request */
-     WriteCombine
- 	= xf86ReturnOptValBool(pRendition->Options, OPTION_FBWC, WriteCombine);
-+#ifdef XSERVER_LIBPCIACCESS
-+    mapOption = PCI_DEV_MAP_FLAG_WRITABLE;
-+    if (WriteCombine)
-+	mapOption |= PCI_DEV_MAP_FLAG_WRITE_COMBINE;
-+
-+    err = pci_device_map_range(pRendition->PciInfo,
-+			       pRendition->PciInfo->regions[0].base_addr,
-+			       pRendition->PciInfo->regions[0].size,
-+			       mapOption, (void *)&pRendition->board.vmem_base);
-+
-+    return (err == 0);
-+#else
-     if (WriteCombine) {
- 	xf86DrvMsg(pScreenInfo->scrnIndex, X_CONFIG,
- 		   ("Requesting Write-Combined memory access\n"));
-@@ -1382,12 +1393,6 @@ renditionMapMem(ScrnInfoPtr pScreenInfo)
- 	mapOption = VIDMEM_MMIO;
-     }
- 
--#ifdef XSERVER_LIBPCIACCESS
--    err = pci_device_map_region(pRendition->PciInfo, 0, TRUE);
--    pRendition->board.vmem_base = pRendition->PciInfo->regions[0].memory;
--
--    return (err == 0);
--#else
-     pRendition->board.vmem_base=
-         xf86MapPciMem(pScreenInfo->scrnIndex, mapOption,
- 		      pRendition->pcitag,
-@@ -1416,7 +1421,7 @@ renditionUnmapMem(ScrnInfoPtr pScreenInf
- #else
-     pci_device_unmap_range(pRendition->PciInfo, 
- 			   pRendition->board.vmem_base,
--			   pScreenInfo->videoRam * 1024);
-+			   pRendition->PciInfo->regions[0].size);
- #endif
-     return TRUE;
- #ifdef DEBUG0
diff --git a/x11/xf86-video-rendition/patches/patch-src_rendition.h b/x11/xf86-video-rendition/patches/patch-src_rendition.h
deleted file mode 100644
index d0ba602a529..00000000000
--- a/x11/xf86-video-rendition/patches/patch-src_rendition.h
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-src_rendition.h,v 1.1 2015/04/02 22:16:47 tnn Exp $
-
-From df5646745bf563bb36a0db1796c318fe64bf8efe Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Sep 2014 10:24:18 -0400
-Subject: Remove dependency on xf86PciInfo.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-From 30a4b73644ee22904824d4847e44ca69369fad02 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Sep 2014 10:21:58 -0400
-Subject: Fix build against xserver 1.17
-
-Also port from pci_device_map_region to pci_device_map_range.  Somewhat
-alarming that the previous code was using map_region but unmap_range...
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
---- src/rendition.h.orig	2015-04-02 19:20:48.000000000 +0000
-+++ src/rendition.h
-@@ -14,9 +14,6 @@
- /* Everything using inb/outb, etc needs "compiler.h" */
- #include "compiler.h"
- 
--/* Drivers for PCI hardware need this */
--#include "xf86PciInfo.h"
--
- /* Drivers that need to access the PCI config space directly need this */
- #include "xf86Pci.h"
- 
-@@ -28,9 +25,6 @@
- /* All drivers initialising the SW cursor need this */
- #include "mipointer.h"
- 
--/* All drivers implementing backing store need this */
--#include "mibstore.h"
--
- /* All drivers using the mi colormap manipulation need this */
- #include "micmap.h"
- 
-@@ -69,4 +63,8 @@
- 
- #include "compat-api.h"
- /* end of __RENDITION_H__ */
-+
-+#define PCI_CHIP_V1000 0x0001
-+#define PCI_CHIP_V2x00 0x2000
-+
- #endif